SZEDER Gábor efb779f887 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>		2008-04-12 19:28:18 -07:00
..
git-completion.bash	merge, pull: add '--(no-)log' command line option	2008-04-12 19:28:18 -07:00