Hi there! I switched to using magit a week ago, and it's been such a pleasure
to use this tool. Thanks to everyone who's helped to make this happen!
Now, I've come across a problem with rebasing and I want some advice. I want
to rebase a branch onto the tip of another branch, but magit-rebase-step and
magit-interactive-rebase always adds a ^ to the end of the hash, so I can't
seem to select the tip.
For example, I have a repo whose graphical log looks like this:
abcd123 * [HEAD][foo] Add foo.
2edc8b1 | * [bar] Add bar.
|/
123abcd * Before diverging.
I want to do a git rebase -i bar, with the HEAD at foo, so that I have
something like
abcd000 * [HEAD][foo] Add foo.
2edc8b1 * [bar] Add bar.
123abcd * Before diverging.
But when I place point over [bar] and type E, magit calls
$ git --no-pager rebase -i 2edc8b1^
and the commit abcd123 is replayed over 123abcd instead of over [bar], i.e. it
doesn't really do anything besides waste CPU cycles.
I worked around this by moving point in between commits (the part that just
shows |/), which forces the rebase command to prompt for the base commit, but
I'd like to ask:
- What's the purpose of having magit add ^ to the commit? It seems quite
deliberate judging from the source code, but I can't think of a use for it.
- What's the intended way to do a rebase like the above, where I want commits
to be replayed on the tip of a branch?
--
You received this message because you are subscribed to the Google Groups
"magit" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
