diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-09-12 02:02:29 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-12 02:02:29 +0400 |
| commit | 135be1ee2b6cc5b006974e38111990f0e22accd5 (patch) | |
| tree | 9cc41fea9f2b1d56c78916a23ceca4ddcf393e4b /dir.h | |
| parent | 8c731e9c8f92b138c31a0897321a2578ba9221e5 (diff) | |
| parent | 75c69766554c4b34ede65502d481dd7beb7f3388 (diff) | |
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 'dir.h')
0 files changed, 0 insertions, 0 deletions