![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sat, 4 Dec 2010 00:13:06 +0000 (16:13 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 4 Dec 2010 00:13:06 +0000 (16:13 -0800) | ||
| commit | 9bec60d3a52fa10b276214f8d255d6ff05a04b77 | |
| tree | 0952a0582193715b67d97de9cf8c0875455bc10d | tree | snapshot |
| parent | 45a7b55d6fe69581d12b83f63337eaa1015b6717 | commit | diff |
| parent | 7951bd3029a849411181935f84600ddbcd97cd0c | commit | diff |
Merge branch 'pn/commit-autosquash'
* 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:
Documentation/git-commit.txt
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:
Documentation/git-commit.txt
t/t3415-rebase-autosquash.sh
| Documentation/git-commit.txt | diff1 | | diff2 | | blob | history |
| builtin/commit.c | diff1 | | diff2 | | blob | history |
| builtin/log.c | diff1 | | diff2 | | blob | history |
| cache.h | diff1 | | diff2 | | blob | history |
| commit.c | diff1 | | diff2 | | blob | history |
| environment.c | diff1 | | diff2 | | blob | history |
| t/t3415-rebase-autosquash.sh | diff1 | | diff2 | | blob | history |