| commit | efb779f8873e5aa36be29a4e551186c62c1b580c | |
| author | SZEDER Gábor <szeder@ira.uka.de> | |
| Sun, 6 Apr 2008 01:23:46 +0000 (6 03:23 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 13 Apr 2008 02:28:18 +0000 (12 19:28 -0700) | ||
| tree | fee6f6a34142af04294bbb2ce13822bf4ccb1c13 | treesnapshot (tar.gz zip) |
| parent | 6cd9cfefc505ed5ab5ff435ff9ef338ac8721225 | commitdiff |
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>
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>