merge, pull: add '--(no-)log' command line option
authorSZEDER Gábor <szeder@ira.uka.de>
Sun, 6 Apr 2008 01:23:46 +0000 (03:23 +0200)
committerJunio C Hamano <gitster@pobox.com>
Sun, 13 Apr 2008 02:28:18 +0000 (19:28 -0700)
commitefb779f...873e5aa36be29a4e551186c62c1b580c
treefee6f6a...4142af04294bbb2ce13822bf4ccb1c13copy hash to clipboard (tree)
parent6cd9cfe...c505ed5ab5ff435ff9ef338ac8721225copy hash to clipboard (diff)
Documentation/merge-options.txt
contrib/completion/git-completion.bash
git-merge.sh
git-pull.sh
t/t7600-merge.sh