Re: rebase -p loses amended changes
- From
Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
- Date
- Apr 5, 2012, 16:43 UTC
- Message-ID
- <CAOeW2eHJYiHswmzJeMnce5cpcA7zFi7kiH9CsZdNcHB7G+CtUA@mail.gmail.com>
- In-Reply-To
- <CAH3AnrrYVNDN4cY7EmFsFyjC50wifuoPj1jSLPTxsSUy5+4aiQ@mail.gmail.com>
On Thu, Apr 5, 2012 at 9:33 AM, Jon Seymour <jon.seymour@gmail.com> wrote:
Show 23 quoted lines
>> >> With this history >> >> .-e-. >> / \ >> .-c---d---f >> / >> a---b---g >> >> , "git rebase -p --onto g b f" produces >> >> >> .-e'. >> / \ >> a---b---g---c'--d'--f' >> > > Perhaps there is a a formatting issue here, but wouldn't the resulting > history be, instead: > > . -e'. > / \ > a---b---g---c'--d'--f'
That's how it looked before I pasted it into gmail. Sorry about that and thanks for clarifying.
> I don't really understand why e' - c' would be different to e-c?
Not "would", but "could", if you're using -i as well and choose the "edit" action for commit e (or if merge conflict makes it halt while creating e').