diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-10-17 15:45:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-10-17 15:45:50 -0700 |
| commit | f8a3fd28fd9e61852f5944335e7338c52c8c5abd (patch) | |
| tree | 5bf4dc994ba91b67bf5df68c01ebc6a2ee1cd1e2 /contrib/fast-import | |
| parent | Merge branch 'rt/rebase-p-no-merge-summary' into maint (diff) | |
| parent | rebase -i: fix short SHA-1 collision (diff) | |
| download | tgif-f8a3fd28fd9e61852f5944335e7338c52c8c5abd.tar.xz | |
Merge branch 'es/rebase-i-no-abbrev' into maint
* es/rebase-i-no-abbrev:
rebase -i: fix short SHA-1 collision
t3404: rebase -i: demonstrate short SHA-1 collision
t3404: make tests more self-contained
Conflicts:
t/t3404-rebase-interactive.sh
Diffstat (limited to 'contrib/fast-import')
0 files changed, 0 insertions, 0 deletions