This patch series adds new command line options to git-commit to make it easy to specify messages for commits correctly formatted for use wit 'rebase -i --autosquash'. The 2nd iteration addressed concerns raised earlier: http://thread.gmane.org/gmane.comp.version-control.git/156369 . Most notably, --squash=COMMIT now works with -m/-c/-C/-F and uses the editor when appropriate. The 3rd iteration added documentation links from --squash and --fixup to git-rebase(1) and updated the tests to conform to established style (editor script moved into t7500/ directory). This 4th iteration adds missing '&&' to a couple of lines in the tests. Pat Notz (4): commit: --fixup option for use with rebase --autosquash t7500: add tests of commit --fixup commit: --squash option for use with rebase --autosquash t7500: add tests of commit --squash Documentation/git-commit.txt | 21 +++++++++-- builtin/commit.c | 58 +++++++++++++++++++++++++++--- t/t7500-commit.sh | 80 ++++++++++++++++++++++++++++++++++++++++++ t/t7500/edit-content | 4 ++ 4 files changed, 154 insertions(+), 9 deletions(-) create mode 100755 t/t7500/edit-content -- 1.7.3 -- 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