diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-09-17 13:53:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-09-17 13:53:51 -0700 |
| commit | 39006893f9fce70d8d2fe055e4285e1fca0ca050 (patch) | |
| tree | e353cf8f1268385a4fa9405f617890a01ad9c30b /git-submodule.sh | |
| parent | Merge branch 'ds/multi-pack-index' (diff) | |
| parent | rerere: recalculate conflict ID when unresolved conflict is committed (diff) | |
| download | tgif-39006893f9fce70d8d2fe055e4285e1fca0ca050.tar.xz | |
Merge branch 'tg/rerere'
Fixes to "git rerere" corner cases, especially when conflict
markers cannot be parsed in the file.
* tg/rerere:
rerere: recalculate conflict ID when unresolved conflict is committed
rerere: teach rerere to handle nested conflicts
rerere: return strbuf from handle path
rerere: factor out handle_conflict function
rerere: only return whether a path has conflicts or not
rerere: fix crash with files rerere can't handle
rerere: add documentation for conflict normalization
rerere: mark strings for translation
rerere: wrap paths in output in sq
rerere: lowercase error messages
rerere: unify error messages when read_cache fails
Diffstat (limited to 'git-submodule.sh')
0 files changed, 0 insertions, 0 deletions