]> git.ipfire.org Git - thirdparty/git.git/commit - t/t7600-merge.sh
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6cd9cfe) | patch
merge, pull: add '--(no-)log' command line option
authorSZEDER Gábor <szeder@ira.uka.de>
Sun, 6 Apr 2008 01:23:46 +0000 (03:23 +0200)
committerJunio C Hamano <gitster@pobox.com>
Sun, 13 Apr 2008 02:28:18 +0000 (19:28 -0700)
commitefb779f8873e5aa36be29a4e551186c62c1b580c
treefee6f6a34142af04294bbb2ce13822bf4ccb1c13tree | snapshot
parent6cd9cfefc505ed5ab5ff435ff9ef338ac8721225commit | 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>
Documentation/merge-options.txt diff | blob | blame | history
contrib/completion/git-completion.bash diff | blob | blame | history
git-merge.sh diff | blob | blame | history
git-pull.sh diff | blob | blame | history
t/t7600-merge.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.