Merge branch 'se/rebase'
commitdd097fcd4d3d6692ec19c0caf4686aa8849301a2
authorJunio C Hamano <junkio@cox.net>
Tue, 2 May 2006 05:39:57 +0000 (1 22:39 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 2 May 2006 05:39:57 +0000 (1 22:39 -0700)
tree41fad70908e7631229bace1d16f116d23dd93d22
parent66ae0c7702e68765dad17aa05c5d9255d999216c
parent031321c654de3c19de45b2dacbdc990b5a694e34
Merge branch 'se/rebase'

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