projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e2b1405 6099835)
Merge branch 'jc/want-commit'
authorJunio C Hamano <gitster@pobox.com>
Wed, 5 Oct 2011 19:35:55 +0000 (12:35 -0700)
committerJunio 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

diff --cc builtin/merge.c
Simple merge
Git—the stupid content tracker