rerere: add documentation for conflict normalization
authorThomas Gummerer <t.gummerer@gmail.com>
Sun, 5 Aug 2018 17:20:31 +0000 (18:20 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 6 Aug 2018 20:22:34 +0000 (13:22 -0700)
commitfb90dca34c498ac1f922d579c202b4723e87455a
tree00ab0ad3129b666902709db3f82aeb47b43f25a8
parent2373b6505966244ab3f5b630680169692d28f6f6
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>
Documentation/technical/rerere.txt [new file with mode: 0644]
rerere.c