]> git.ipfire.org Git - thirdparty/git.git/commit - builtin/merge.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 541d1fa) | patch
merge: introduce merge.ff configuration variable
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 May 2011 19:27:05 +0000 (12:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 May 2011 22:12:30 +0000 (15:12 -0700)
commitf23e8decd544c8f81b40c98211f6cb028fa70cdc
tree46722262fd27b289b619373a331794397f481c1ctree | snapshot
parent541d1fa85ca4741e8b6db281f3d788dcfc423bdccommit | diff
merge: introduce merge.ff configuration variable

This variable gives the default setting for --ff, --no-ff or --ff-only
options of "git merge" command.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/merge-config.txt diff | blob | blame | history
builtin/merge.c diff | blob | blame | history
t/t7600-merge.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.