summaryrefslogtreecommitdiff
path: root/Documentation/git-status.txt
diff options
context:
space:
mode:
authorLibravatar SZEDER Gábor <szeder@ira.uka.de>2008-04-06 03:23:46 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-04-12 19:28:18 -0700
commitefb779f8873e5aa36be29a4e551186c62c1b580c (patch)
treefee6f6a34142af04294bbb2ce13822bf4ccb1c13 /Documentation/git-status.txt
parentfmt-merge-msg: add '--(no-)log' options and 'merge.log' config variable (diff)
downloadtgif-efb779f8873e5aa36be29a4e551186c62c1b580c.tar.xz
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 'Documentation/git-status.txt')
0 files changed, 0 insertions, 0 deletions