summaryrefslogtreecommitdiff
path: root/cache-tree.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-09-17 20:53:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-09-17 20:53:51 (GMT)
commit39006893f9fce70d8d2fe055e4285e1fca0ca050 (patch)
treee353cf8f1268385a4fa9405f617890a01ad9c30b /cache-tree.h
parent49f210fd5279eeb0106cd7e4383a1c4454d30428 (diff)
parentbd7dfa543e0263858071b8648a55ef7ccae1085b (diff)
downloadgit-39006893f9fce70d8d2fe055e4285e1fca0ca050.zip
git-39006893f9fce70d8d2fe055e4285e1fca0ca050.tar.gz
git-39006893f9fce70d8d2fe055e4285e1fca0ca050.tar.bz2
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 'cache-tree.h')
0 files changed, 0 insertions, 0 deletions