> * sh/maint-rebase3 (Sun Oct 5 23:26:52 2008 -0500) 1 commit > . rebase--interactive: fix parent rewriting for dropped commits > > Tentatively dropped from everwhere, waiting for a reroll together with > sh/rebase-i-p. Assuming sh/maint-rebase3 goes before sh/rebase-i-p, there are no changes to it. I rebased it on top of sp/maint and the tests passed. > * sh/rebase-i-p (Wed Oct 8 01:41:57 2008 -0500) 7 commits > - rebase-i-p: if todo was reordered use HEAD as the rewritten parent > - rebase-i-p: do not include non-first-parent commits touching > UPSTREAM > - rebase-i-p: only list commits that require rewriting in todo > - rebase-i-p: fix 'no squashing merges' tripping up non-merges > - rebase-i-p: delay saving current-commit to REWRITTEN if squashing > - rebase-i-p: use HEAD for updating the ref instead of mapping > OLDHEAD > - rebase-i-p: test to exclude commits from todo based on its parents > > Changes the `rebase -i -p` behavior to behave like git sequencer's > rewrite of `rebase -i` would behave. Attempting to follow your previous advice, I merged sp/master onto my local sh/maint-rebase3, and rebased sh/rebase-i-p on top that resulting merge, and got the changes fixed to play nicely with sh/maint-rebase3 +master, and integrated your feedback. I'll be sending the new sh/rebase-i-p series soon. Let me know if I did the wrong thing--your comment of maint-rebase3 "waiting for a reroll" makes me think you wanted that one rebased on top of rebase-i-p, when I just got done doing the opposite (I hadn't checked the git list before hacking on it). Thanks, Stephen -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
