]> git.ipfire.org Git - thirdparty/git.git/commit - rerere.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 1d51ece) | patch
rerere: un-nest merge() further
authorJunio C Hamano <gitster@pobox.com>
Mon, 6 Jul 2015 22:32:53 +0000 (15:32 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 24 Jul 2015 23:05:40 +0000 (16:05 -0700)
commit15ed07d532db743a2a397a38bacc1f20e54b2c80
tree118aa0160e95a6ea5f8f29068ac640922f75b1a2tree | snapshot
parent1d51eced103f1c3e36beb6c1e01a413660910a50commit | diff
rerere: un-nest merge() further

By consistently using "upon failure, set 'ret' and jump to out"
pattern, flatten the function further.

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.