Changes since the first round: As suggested by Johannes Sixt, source git-rebase--interactive.sh and friends instead of executing them. As suggested by Thomas Rast, downcase all variables for consitency. Based on current master, including Jeff's two patches to rebase. There are also a few other minor changes, but see the notes in each patch for more information. Martin von Zweigbergk (31): rebase: clearer names for directory variables rebase: refactor reading of state rebase: read state outside loop rebase: remove unused rebase state 'prev_head' rebase: improve detection of rebase in progress rebase: act on command line outside parsing loop rebase: stricter check of standalone sub command rebase: align variable names rebase: align variable content rebase: factor out command line option processing rebase -i: remove now unnecessary directory checks rebase: reorder validation steps rebase: factor out reference parsing rebase: factor out clean work tree check rebase: factor out call to pre-rebase hook rebase -i: support --stat rebase: remove $branch as synonym for $orig_head rebase: extract merge code to new source file rebase: extract am code to new source file rebase: show consistent conflict resolution hint rebase -i: align variable names rebase: make -v a tiny bit more verbose rebase: factor out sub command handling rebase: extract code for writing basic state rebase: remember verbose option rebase: remember strategy and strategy options rebase -m: remember allow_rerere_autoupdate option rebase -m: don't print exit code 2 when merge fails git-rebase--am: remove unnecessary --3way option rebase -i: don't read unused variable preserve_merges rebase -i: remove unnecessary state rebase-root .gitignore | 2 + Makefile | 2 + git-rebase--am.sh | 30 ++ git-rebase--interactive.sh | 751 +++++++++++++++---------------------------- git-rebase--merge.sh | 151 +++++++++ git-rebase.sh | 482 +++++++++++----------------- t/t3403-rebase-skip.sh | 5 + t/t3407-rebase-abort.sh | 10 + t/t3418-rebase-continue.sh | 55 ++++ 9 files changed, 707 insertions(+), 781 deletions(-) create mode 100644 git-rebase--am.sh create mode 100644 git-rebase--merge.sh -- 1.7.4.rc2.33.g8a14f -- 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