From: SZEDER Gábor <szeder@ira.uka.de>
Date: Sun, 6 Apr 2008 01:23:46 +0000 (+0200)
Subject: merge, pull: add '--(no-)log' command line option
X-Git-Tag: v1.5.6-rc0~79^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/efb779f8873e5aa36be29a4e551186c62c1b580c?ds=sidebyside;hp=efb779f8873e5aa36be29a4e551186c62c1b580c

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>
---