Merge branch 'se/rebase' into next
authorJunio C Hamano <junkio@cox.net>
Thu, 27 Apr 2006 00:24:15 +0000 (17:24 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 27 Apr 2006 00:24:15 +0000 (17:24 -0700)
commit3b24343a87ef1b257a74ca32af5bb9e8ef573580
tree44e05888fe961bd82a5e18560f9a8814853460e9
parentf996fbf8a09d54cb293cdbc05713ca6a4678740a
parent031321c654de3c19de45b2dacbdc990b5a694e34
Merge branch 'se/rebase' into next

* se/rebase:
  Add --continue and --abort options to git-rebase.