diff options
| author | SZEDER Gábor <szeder@ira.uka.de> | 2008-04-06 03:23:46 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-04-12 19:28:18 -0700 |
| commit | efb779f8873e5aa36be29a4e551186c62c1b580c (patch) | |
| tree | fee6f6a34142af04294bbb2ce13822bf4ccb1c13 /builtin-fmt-merge-msg.c | |
| parent | 6cd9cfefc505ed5ab5ff435ff9ef338ac8721225 (diff) | |
| download | git-efb779f8873e5aa36be29a4e551186c62c1b580c.tar.gz | |
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 'builtin-fmt-merge-msg.c')
0 files changed, 0 insertions, 0 deletions