diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-04 01:13:06 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-04 01:13:06 +0100 |
| commit | 9bec60d3a52fa10b276214f8d255d6ff05a04b77 (patch) | |
| tree | 0952a0582193715b67d97de9cf8c0875455bc10d /aclocal.m4 | |
| parent | Merge branch 'sn/diff-doc' (diff) | |
| parent | add tests of commit --squash (diff) | |
| download | git-9bec60d3a52fa10b276214f8d255d6ff05a04b77.tar.xz git-9bec60d3a52fa10b276214f8d255d6ff05a04b77.zip | |
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
Diffstat (limited to 'aclocal.m4')
0 files changed, 0 insertions, 0 deletions