| commit | b814da891e8261b909fc5d9fb07b4e8b13989c2d | |
| author | David Aguilar <davvid@gmail.com> | |
| Wed, 15 Jan 2014 23:18:38 +0000 (15 15:18 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 16 Jan 2014 00:01:06 +0000 (15 16:01 -0800) | ||
| tree | 20bdca746012df5441dbfc5bdaab9a75e9649c7d | treesnapshot (tar.gz zip) |
| parent | 4224916ae979204f13db2996d9e32490e0acb90f | commitdiff |
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>
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 | diffblobblamehistory | |
| git-pull.sh | diffblobblamehistory | |
| t/t7601-merge-pull-config.sh | diffblobblamehistory |