]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c749ab1) | patch
merge-recursive: move some definitions around to clean up the header
authorElijah Newren <newren@gmail.com>
Sat, 17 Aug 2019 18:41:37 +0000 (11:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 19 Aug 2019 17:08:04 +0000 (10:08 -0700)
commit7c0a6c8e477bd9009001590f49274e892e92fce8
tree833598f74abcf6a5e383db0449620eaf7cdf01c1tree | snapshot
parentc749ab1da812cdb1263f868c63fe1808a12dcff2commit | diff
merge-recursive: move some definitions around to clean up the header

No substantive code changes (view this with diff --color-moved), but
a few small code cleanups:
  * Move structs and an inline function only used by merge-recursive.c
    into merge-recursive.c
  * Re-order function declarations to be more logical
  * Add or fix some explanatory comments

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-recursive.c diff | blob | history
merge-recursive.h diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.