search

max630 / git-rehi

git-rehi, history editor
https://github.com/max630/git-rehi/wiki
GNU General Public License v2.0
3 stars 0 forks source link

Abort checks out old dest_to, should checkout out older HEAD if they are different #17

Closed max630 closed 10 years ago

max630 commented 10 years ago

If explicit target branch is used, after --abort it is checked out in its older place;

PS: in general this piece of original rebase interface is bad; sometime I would prefer advance the current master instead of changing the branch which is happen to point to the end of range I want to rebase (it can be just a hash)

max630 commented 10 years ago

The interface could be like: git rebase2 --src <from>..<through1>..<through2>..<to> --dest <dest> --target <target> with shorter forms for nicety

max630 commented 10 years ago

positional version: git rebase2 [-i] <dest> [<from>..<through1>..<through2>..<to>] [<target>] If <from> is omitted, it is the latest common ancestor of <dest> and <to>. If <to> is omitted, <target> is used instead. If <target> is omitted, the currently checked-out branch is used. If the source argument <from>..<through1>..<through2>..<to>, it is equivalent to specification "..". Looks like it's equivalent to previous behavior then

max630 commented 10 years ago

Now there is a fix and test for it