]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e828de8) | patch
rerere: refactor "replay" part of do_plain_rerere()
authorJunio C Hamano <gitster@pobox.com>
Wed, 1 Jul 2015 02:36:24 +0000 (19:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 24 Jul 2015 23:02:37 +0000 (16:02 -0700)
commit8e7768b2de8bfdf82cde565d2f42e8d7f91e74e0
tree5b237bf896f50cf904f1cae366f3bf5173ab78d5tree | snapshot
parente828de826bd0b852337b9625354c7c73d8de20c0commit | diff
rerere: refactor "replay" part of do_plain_rerere()

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>
rerere.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.