summaryrefslogtreecommitdiff
path: root/builtin/clone.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-04-02 00:57:16 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-04-02 00:57:16 (GMT)
commitffc5e3c958b66fb4babeba01483cc924bc2957a5 (patch)
tree4cea1fc19bb4b720d04ac102c2a30f6dec864679 /builtin/clone.c
parentb966427b53b246e722df1e5502b9145eb9dd063a (diff)
parent93e535a5b78c9861eca3e9371d1c3e5173c0ab02 (diff)
downloadgit-ffc5e3c958b66fb4babeba01483cc924bc2957a5.zip
git-ffc5e3c958b66fb4babeba01483cc924bc2957a5.tar.gz
git-ffc5e3c958b66fb4babeba01483cc924bc2957a5.tar.bz2
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
Diffstat (limited to 'builtin/clone.c')
0 files changed, 0 insertions, 0 deletions