![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 25 Nov 2010 00:00:32 +0000 (16:00 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 25 Nov 2010 00:00:32 +0000 (16:00 -0800) | ||
| commit | acc9c78da29dce121c086ea2d096cd38bfd5dcac | |
| tree | 5646772d6fed8e3c3b088d0e777cce9d14ea57f6 | tree | snapshot |
| parent | 0da938579825cef757e8c5cccb93920467574da7 | commit | diff |
| parent | 7951bd3029a849411181935f84600ddbcd97cd0c | commit | diff |
Merge branch 'pn/commit-autosquash' into next
* pn/commit-autosquash:
add tests of commit --squash
commit: --squash option for use with rebase --autosquash
add tests of commit --fixup
commit: --fixup option for use with rebase --autosquash
pretty.c: teach format_commit_message() to reencode the output
commit: helper methods to reduce redundant blocks of code
Conflicts:
t/t3415-rebase-autosquash.sh
* pn/commit-autosquash:
add tests of commit --squash
commit: --squash option for use with rebase --autosquash
add tests of commit --fixup
commit: --fixup option for use with rebase --autosquash
pretty.c: teach format_commit_message() to reencode the output
commit: helper methods to reduce redundant blocks of code
Conflicts:
t/t3415-rebase-autosquash.sh
| builtin/commit.c | diff1 | | diff2 | | blob | history |
| builtin/log.c | diff1 | | diff2 | | blob | history |
| cache.h | diff1 | | diff2 | | blob | history |
| t/t3415-rebase-autosquash.sh | diff1 | | diff2 | | blob | history |