git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2373b65)
rerere: add documentation for conflict normalization
authorThomas Gummerer <redacted>
Sun, 5 Aug 2018 17:20:31 +0000 (18:20 +0100)
committerJunio C Hamano <redacted>
Mon, 6 Aug 2018 20:22:34 +0000 (13:22 -0700)
commitfb90dca34c498ac1f922d579c202b4723e87455a
tree00ab0ad3129b666902709db3f82aeb47b43f25a8tree | snapshot
parent2373b6505966244ab3f5b630680169692d28f6f6commit | diff
rerere: add documentation for conflict normalization

Add some documentation for the logic behind the conflict normalization
in rerere.

Helped-by: Junio C Hamano <redacted>
Signed-off-by: Thomas Gummerer <redacted>
Signed-off-by: Junio C Hamano <redacted>
Documentation/technical/rerere.txt [new file with mode: 0644] blob
rerere.c diff | blob | history
git clone https://git.99rst.org/PROJECT