![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Nanako Shiraishi <nanako3@lavabit.com> | |
| Tue, 8 Dec 2009 03:13:14 +0000 (12:13 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 7 Jan 2010 01:18:56 +0000 (17:18 -0800) | ||
| commit | f59baa502f49c3f1579a82bc37d2bb3ce9e7b5da | |
| tree | 68571e1d4bc751a39720cc57871c1d20f8e8b3be | tree | snapshot |
| parent | 0205e72f088322a70a77643a7cd2d8b23ee07e14 | commit | diff |
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>
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>
| Documentation/git-rebase.txt | diff | blob | history | |
| git-rebase--interactive.sh | diff | blob | history | |
| t/t3415-rebase-autosquash.sh | [new file with mode: 0755] | blob |