diff options
| author | David Aguilar <davvid@gmail.com> | 2014-01-15 23:18:38 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-16 00:01:06 (GMT) |
| commit | b814da891e8261b909fc5d9fb07b4e8b13989c2d (patch) | |
| tree | 20bdca746012df5441dbfc5bdaab9a75e9649c7d /t/t7004-tag.sh | |
| parent | 4224916ae979204f13db2996d9e32490e0acb90f (diff) | |
| download | git-b814da891e8261b909fc5d9fb07b4e8b13989c2d.zip git-b814da891e8261b909fc5d9fb07b4e8b13989c2d.tar.gz git-b814da891e8261b909fc5d9fb07b4e8b13989c2d.tar.bz2 | |
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>
Diffstat (limited to 't/t7004-tag.sh')
0 files changed, 0 insertions, 0 deletions