diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-09-11 15:02:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-11 15:02:29 -0700 |
| commit | 135be1ee2b6cc5b006974e38111990f0e22accd5 (patch) | |
| tree | 9cc41fea9f2b1d56c78916a23ceca4ddcf393e4b /t/t6021-merge-criss-cross.sh | |
| parent | Merge branch 'rt/rebase-p-no-merge-summary' (diff) | |
| parent | rebase -i: fix short SHA-1 collision (diff) | |
| download | tgif-135be1ee2b6cc5b006974e38111990f0e22accd5.tar.xz | |
Merge branch 'es/rebase-i-no-abbrev'
The commit object names in the insn sheet that was prepared at the
beginning of "rebase -i" session can become ambiguous as the
rebasing progresses and the repository gains more commits. Make
sure the internal record is kept with full 40-hex object names.
* 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
Diffstat (limited to 't/t6021-merge-criss-cross.sh')
0 files changed, 0 insertions, 0 deletions