projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4a27759 b81e00a)
Merge branch 'jc/deprecate-old-syntax-from-merge'
authorJunio C Hamano <gitster@pobox.com>
Tue, 1 Dec 2009 20:47:01 +0000 (12:47 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 1 Dec 2009 20:47:01 +0000 (12:47 -0800)
* jc/deprecate-old-syntax-from-merge:
  git-merge: a deprecation notice of the ancient command line syntax

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

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