diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-04-01 17:57:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-01 17:57:16 -0700 |
| commit | ffc5e3c958b66fb4babeba01483cc924bc2957a5 (patch) | |
| tree | 4cea1fc19bb4b720d04ac102c2a30f6dec864679 /generate-cmdlist.sh | |
| parent | Merge branch 'jr/grep-en-config' (diff) | |
| parent | merge: merge with the default upstream branch without argument (diff) | |
| download | tgif-ffc5e3c958b66fb4babeba01483cc924bc2957a5.tar.xz | |
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 'generate-cmdlist.sh')
0 files changed, 0 insertions, 0 deletions