diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-01-15 14:33:54 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-15 14:33:54 -0800 |
| commit | ebb7bbf769e3785e882dffcce69816b88e0838f5 (patch) | |
| tree | 6f8f0af8127ec559f599d71e0691a2aad107f9b7 /merge-recursive.c | |
| parent | Update draft release notes to 1.6.1.1 (diff) | |
| parent | t3404: Add test case for auto-amending only edited commits after "edit" (diff) | |
| download | tgif-ebb7bbf769e3785e882dffcce69816b88e0838f5.tar.xz | |
Merge branch 'maint-1.6.0' into maint
* maint-1.6.0:
t3404: Add test case for auto-amending only edited commits after "edit"
t3404: Add test case for aborted --continue after "edit"
t3501: check that commits are actually done
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions