projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ec61d14) | patch
merge-recursive: Introduce a merge_file convenience function
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:20:12 +0000 (23:20 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:38 +0000 (14:19 -0700)
commit6bdaead1e58ab2aa3ea81a998117d1d5afb41a3b
tree1aadf8ee8f5930394a4aa967d5aca09d40682b39tree | snapshot
parentec61d14963470b02db0d6e3825e2b5bbb1815cb6commit | diff
merge-recursive: Introduce a merge_file convenience function

merge_file previously required diff_filespec arguments, but all callers
only had sha1s and modes.  Rename merge_file to merge_file_1 and introduce
a new merge_file convenience function which takes the sha1s and modes and
creates the temporary diff_filespec variables needed to call merge_file_1.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-recursive.c diff | blob | history
Git—the stupid content tracker