Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
rerere: refactor "replay" part of do_plain_rerere()
author
Junio C Hamano
<gitster@pobox.com>
Wed, 1 Jul 2015 02:36:24 +0000
(19:36 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 24 Jul 2015 23:02:37 +0000
(16:02 -0700)
Extract the body of a loop that attempts to replay recorded
resolution for each conflicted path into a helper function, not
because I want to call it from multiple places later, but because
the logic has become too deeply nested and hard to read.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
raw
|
patch
|
inline
| side by side (from:
8e7768b
)
No differences found