Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jc/want-commit'
author
Junio C Hamano
<gitster@pobox.com>
Wed, 5 Oct 2011 19:35:55 +0000
(12:35 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 5 Oct 2011 19:35:55 +0000
(12:35 -0700)
* jc/want-commit:
Allow git merge ":/<pattern>"
1
2
builtin/merge.c
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
e2b1405
6099835
)
diff --cc
builtin/merge.c
Simple merge