summaryrefslogtreecommitdiff
path: root/object.c
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2011-08-11 23:20:05 -0600
committerJunio C Hamano <gitster@pobox.com>2011-08-14 14:19:37 -0700
commit7769a75e96f998b2f1ef51e8a2e88058f56fa519 (patch)
tree19146cd6e2423c0ceca3da760aabb1707eb8bb1e /object.c
parent0a6b87126e6a4e2649f6da23db67eeaad11d102e (diff)
downloadgit-7769a75e96f998b2f1ef51e8a2e88058f56fa519.tar.gz
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>
Diffstat (limited to 'object.c')
0 files changed, 0 insertions, 0 deletions