tree fee6f6a34142af04294bbb2ce13822bf4ccb1c13
parent 6cd9cfefc505ed5ab5ff435ff9ef338ac8721225
author SZEDER Gábor <szeder@ira.uka.de> 1207445026 +0200
committer Junio C Hamano <gitster@pobox.com> 1208053698 -0700

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>