diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-02-14 23:54:20 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-02-14 23:54:20 +0300 |
commit | 251187084d5ebdb3ba898ba4a8f9b005b7626655 (patch) | |
tree | ea556c7380d8b45c04e92a2e3d6c07ed98700e22 /po/.gitignore | |
parent | c9a33e5e5d7e124feb86ccff08ea466faff53b26 (diff) | |
parent | 26027625dd1ee358e2174a09d519252995d51662 (diff) |
Merge branch 'js/rebase-i-with-colliding-hash'
"git rebase -i" identifies existing commits in its todo file with
their abbreviated object name, which could become ambigous as it
goes to create new commits, and has a mechanism to avoid ambiguity
in the main part of its execution. A few other cases however were
not covered by the protection against ambiguity, which has been
corrected.
* js/rebase-i-with-colliding-hash:
rebase -i: also avoid SHA-1 collisions with missingCommitsCheck
rebase -i: re-fix short SHA-1 collision
parse_insn_line(): improve error message when parsing failed
Diffstat (limited to 'po/.gitignore')
0 files changed, 0 insertions, 0 deletions