These seven patches replace the broken one I sent in
http://thread.gmane.org/gmane.comp.version-control.git/200644/focus=200648. I
hope I got the handling of empty commits right this time.
Martin von Zweigbergk (7):
git-rebase--am.sh: avoid special-casing --keep-empty
git-rebase--interactive.sh: extract function for adding pick line
git-rebase--interactive: group all $preserve_merges code
git-rebase--interactive.sh: look up subject in add_pick_line
rebase -p: use --cherry-mark for todo file
rebase -p: don't request --left-right only to ignore left side
rebase (without -p): correctly calculate patches to rebase
git-am.sh | 10 +-
git-rebase--am.sh | 20 +++
git-rebase--interactive.sh | 87 --
git-rebase--merge.sh | 2 +-
git-rebase.sh | 11 +++---
t/t3401-rebase-partial.sh | 17 +
t/t3406-rebase-message.sh | 14
7 files changed, 81 insertions(+), 80 deletions(-)
--
1.7.11.1.104.ge7b44f1
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
