From: Martin von Zweigbergk Date: Thu, 05 Apr 2012 16:43:34 GMT Subject: Re: rebase -p loses amended changes Message-ID: In-Reply-To: On Thu, Apr 5, 2012 at 9:33 AM, Jon Seymour wrote: >> >> 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').