projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cddec4f 5480207)
Merge branch 'vr/git-merge-default-to-upstream'
authorJunio C Hamano <gitster@pobox.com>
Mon, 5 Dec 2011 23:24:12 +0000 (15:24 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 5 Dec 2011 23:24:14 +0000 (15:24 -0800)
* vr/git-merge-default-to-upstream:
  Show error for 'git merge' with unset merge.defaultToUpstream

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

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