Code

Merge branch 'jc/merge-sans-branch'
authorJunio C Hamano <gitster@pobox.com>
Sat, 2 Apr 2011 00:57:16 +0000 (17:57 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 2 Apr 2011 00:57:16 +0000 (17:57 -0700)
commitffc5e3c958b66fb4babeba01483cc924bc2957a5
tree4cea1fc19bb4b720d04ac102c2a30f6dec864679
parentb966427b53b246e722df1e5502b9145eb9dd063a
parent93e535a5b78c9861eca3e9371d1c3e5173c0ab02
Merge branch 'jc/merge-sans-branch'

* jc/merge-sans-branch:
  merge: merge with the default upstream branch without argument
  merge: match the help text with the documentation

Conflicts:
builtin/merge.c
Documentation/git-merge.txt
Documentation/merge-config.txt
builtin/merge.c