]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cc7655a 379fc37)
Merge branch 'en/merge-recursive-fixes'
authorJunio C Hamano <gitster@pobox.com>
Thu, 15 Feb 2018 22:55:40 +0000 (14:55 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 15 Feb 2018 22:55:40 +0000 (14:55 -0800)
commitae0d0795d736467202d9bfd535942be81529f84e
treec1745c4d7ff506d62e8f4f3d45180937776f5c82tree | snapshot
parentcc7655a5a3465ccce2c84379721dd1cbdd57faa9commit | diff
parent379fc3786611f677b76400f6f7d0ed0faf2a9739commit | diff
Merge branch 'en/merge-recursive-fixes'

* 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.