Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with-dirty-index
author
Junio C Hamano
<gitster@pobox.com>
Tue, 9 Jan 2018 18:41:37 +0000
(10:41 -0800)
committer
Junio 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
raw
|
combined
(merge:
b6825b5
f309e8e
)
diff --cc
merge-recursive.c
Simple merge