]> git.ipfire.org Git - thirdparty/git.git/commit - merge-recursive.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3f9c92e) | patch
merge-recursive: track branch where rename occurred in rename struct
authorElijah Newren <newren@gmail.com>
Fri, 5 Apr 2019 15:00:20 +0000 (08:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 Apr 2019 07:02:07 +0000 (16:02 +0900)
commitc336ab859347036eb5d538a9bd741fb9a95da36a
treede1dcb87977510fccc492a4ef2376dbd3261fa56tree | snapshot
parent3f9c92ec99222515c6ebac1dc12d0bc3a6d4ae08commit | diff
merge-recursive: track branch where rename occurred in rename struct

We previously tracked the branch associated with a rename in a separate
field in rename_conflict_info, but since it is directly associated with
the rename it makes more sense to move it into the rename struct.

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