summaryrefslogtreecommitdiff
path: root/commit.c
diff options
context:
space:
mode:
authorThomas Gummerer <t.gummerer@gmail.com>2018-08-05 18:20:31 +0100
committerJunio C Hamano <gitster@pobox.com>2018-08-06 13:22:34 -0700
commitfb90dca34c498ac1f922d579c202b4723e87455a (patch)
tree00ab0ad3129b666902709db3f82aeb47b43f25a8 /commit.c
parent2373b6505966244ab3f5b630680169692d28f6f6 (diff)
rerere: add documentation for conflict normalization
Add some documentation for the logic behind the conflict normalization in rerere. Helped-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions