diff options
| author | SZEDER Gábor <szeder@ira.uka.de> | 2008-04-06 05:23:46 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-04-13 06:28:18 +0400 |
| commit | efb779f8873e5aa36be29a4e551186c62c1b580c (patch) | |
| tree | fee6f6a34142af04294bbb2ce13822bf4ccb1c13 /contrib | |
| parent | 6cd9cfefc505ed5ab5ff435ff9ef338ac8721225 (diff) | |
merge, pull: add '--(no-)log' command line option
These are the command line option equivalents of the 'merge.log' config
variable.
The patch also updates documentation and bash completion accordingly, and
adds a test.
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/completion/git-completion.bash | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 0f54cfd8a3..8091d2deb7 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -779,7 +779,7 @@ _git_merge () ;; --*) __gitcomp " - --no-commit --no-stat --squash --strategy + --no-commit --no-stat --log --no-log --squash --strategy " return esac |