projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9f59ca7 379fc37)
Merge branch 'en/merge-recursive-fixes' into next
authorJunio C Hamano <gitster@pobox.com>
Thu, 8 Feb 2018 23:08:24 +0000 (15:08 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 8 Feb 2018 23:08:24 +0000 (15:08 -0800)
commitc254292070e6e07902d4ac6fec5b94669920c6a5
tree22df4394dfe7a9c2001b7426a55717d0990647b9tree | snapshot
parent9f59ca72ab9b6530ec9a06e5d9f1bee1097997a2commit | diff
parent379fc3786611f677b76400f6f7d0ed0faf2a9739commit | diff
Merge branch 'en/merge-recursive-fixes' into next

* en/merge-recursive-fixes:
  merge-recursive: add explanation for src_entry and dst_entry
  merge-recursive: fix logic ordering issue
  Tighten and correct a few testcases for merging and cherry-picking
merge-recursive.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.