diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-04-16 19:28:06 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-16 19:28:06 +0900 |
| commit | e197980eb2446da92a4e7d835c05adbc25c17ae0 (patch) | |
| tree | 91d8b4f8cf948a59ed79d7010d7ccb1e2d0bf7a7 /mergetools/guiffy | |
| parent | Merge branch 'dl/subtree-limit-to-one-rev' (diff) | |
| parent | get_oid(): when an object was not found, try harder (diff) | |
| download | tgif-e197980eb2446da92a4e7d835c05adbc25c17ae0.tar.xz | |
Merge branch 'js/get-short-oid-drop-cache'
A corner-case object name ambiguity while the sequencer machinery
is working (e.g. "rebase -i -x") has been (half) fixed.
* js/get-short-oid-drop-cache:
get_oid(): when an object was not found, try harder
sequencer: move stale comment into correct location
sequencer: improve error message when an OID could not be parsed
rebase -i: demonstrate obscure loose object cache bug
Diffstat (limited to 'mergetools/guiffy')
0 files changed, 0 insertions, 0 deletions