diff options
author | Nanako Shiraishi <nanako3@lavabit.com> | 2009-12-08 12:13:14 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-01-06 17:18:56 -0800 |
commit | f59baa502f49c3f1579a82bc37d2bb3ce9e7b5da (patch) | |
tree | 68571e1d4bc751a39720cc57871c1d20f8e8b3be /Documentation/git-fast-import.txt | |
parent | Add a command "fixup" to rebase --interactive (diff) | |
download | tgif-f59baa502f49c3f1579a82bc37d2bb3ce9e7b5da.tar.xz |
rebase -i --autosquash: auto-squash commits
Teach a new option, --autosquash, to the interactive rebase.
When the commit log message begins with "!fixup ...", and there
is a commit whose title begins with the same ..., automatically
modify the todo list of rebase -i so that the commit marked for
squashing come right after the commit to be modified, and change
the action of the moved commit from pick to squash.
Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-fast-import.txt')
0 files changed, 0 insertions, 0 deletions