diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-09-18 19:53:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-18 19:53:25 -0700 |
| commit | ea2408bfe18b4f9d1eaa9d8587c5ae6196552cac (patch) | |
| tree | a1794cb4bef2c8267ee365df5f78c51d5a61ce63 /merge-file.c | |
| parent | Merge branch 'jc/maint-checkout-keep-remove' into maint (diff) | |
| parent | git-rebase--interactive: auto amend only edited commit (diff) | |
| download | tgif-ea2408bfe18b4f9d1eaa9d8587c5ae6196552cac.tar.xz | |
Merge branch 'dp/maint-rebase-fix' into maint
* dp/maint-rebase-fix:
git-rebase--interactive: auto amend only edited commit
git-rebase-interactive: do not squash commits on abort
Diffstat (limited to 'merge-file.c')
0 files changed, 0 insertions, 0 deletions