]> git.ipfire.org Git - thirdparty/git.git/commit - merge-recursive.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0a6b871) | patch
merge-recursive: Add comments about handling rename/add-source cases
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:20:05 +0000 (23:20 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:37 +0000 (14:19 -0700)
commit7769a75e96f998b2f1ef51e8a2e88058f56fa519
tree19146cd6e2423c0ceca3da760aabb1707eb8bb1etree | snapshot
parent0a6b87126e6a4e2649f6da23db67eeaad11d102ecommit | diff
merge-recursive: Add comments about handling rename/add-source cases

There are a couple of places where changes are needed to for situations
involving rename/add-source issues.  Add comments about the needed changes
(and existing bugs) until git has been enabled to detect such cases.

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.