From: Junio C Hamano Date: Mon, 16 Nov 2009 00:40:50 +0000 (-0800) Subject: Merge branch 'sc/difftool-p4merge' X-Git-Tag: v1.6.6-rc0~50 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9fa51ff940d41c7bbacf91b81d860d4c18b9ee1e?ds=inline;hp=-c Merge branch 'sc/difftool-p4merge' * sc/difftool-p4merge: mergetool--lib: add p4merge as a pre-configured mergetool option --- 9fa51ff940d41c7bbacf91b81d860d4c18b9ee1e diff --combined contrib/completion/git-completion.bash index a0917d1809,2a9a88968f..bd66639d48 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@@ -953,7 -953,7 +953,7 @@@ _git_diff ( } __git_mergetools_common="diffuse ecmerge emerge kdiff3 meld opendiff - tkdiff vimdiff gvimdiff xxdiff araxis + tkdiff vimdiff gvimdiff xxdiff araxis p4merge " _git_difftool () @@@ -1224,7 -1224,7 +1224,7 @@@ _git_log ( __git_merge_options=" --no-commit --no-stat --log --no-log --squash --strategy - --commit --stat --no-squash --ff --no-ff + --commit --stat --no-squash --ff --no-ff --ff-only " _git_merge ()