My Various Git Projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3630be2 204a8ff)
Merge branch 'ab/merge-file-prefix' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 5 Mar 2015 21:13:10 +0000 (13:13 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 5 Mar 2015 21:13:11 +0000 (13:13 -0800)
commit33367575b85a115900deac600cc4f8f03ec4754b
tree1bf8567d605c6265bd5d1f43d9bafcf80aac54d4tree | snapshot
parent3630be2749819b79de917a77c6627e3f84c00a11commit | diff
parent204a8ffe67d2b789a34a14a06618a24756f7d9a9commit | diff
Merge branch 'ab/merge-file-prefix' into maint

"git merge-file" did not work correctly in a subdirectory.

* ab/merge-file-prefix:
  merge-file: correctly open files when in a subdir
t/t6023-merge-file.sh diff1 | diff2 | blob | history
The core git plumbing