OSDN Git Service

(root) / git-core / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b6825b5 f309e8e)
Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with-dirty...
authorJunio C Hamano <gitster@pobox.com>
Tue, 9 Jan 2018 18:41:37 +0000 (10:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 9 Jan 2018 18:41:37 +0000 (10:41 -0800)
* ew/empty-merge-with-dirty-index-maint:
  merge-recursive: do not look at the index during recursive merge

1  2 
merge-recursive.c patch | diff1 | diff2 | blob | history

diff --cc merge-recursive.c
Simple merge
Mirror of official git.git repository
About OSDN
Find Software
Develop Software
Help