]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4224916) | patch
pull: add pull.ff configuration
authorDavid Aguilar <davvid@gmail.com>
Wed, 15 Jan 2014 23:18:38 +0000 (15:18 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 16 Jan 2014 00:01:06 +0000 (16:01 -0800)
commitb814da891e8261b909fc5d9fb07b4e8b13989c2d
tree20bdca746012df5441dbfc5bdaab9a75e9649c7dtree | snapshot
parent4224916ae979204f13db2996d9e32490e0acb90fcommit | diff
pull: add pull.ff configuration

Add a `pull.ff` configuration option that is analogous
to the `merge.ff` option.

This allows us to control the fast-forward behavior for
pull-initiated merges only.

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/config.txt diff | blob | blame | history
git-pull.sh diff | blob | blame | history
t/t7601-merge-pull-config.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.