diff options
| author |  David Aguilar <davvid@gmail.com> | 2014-01-15 15:18:38 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-01-15 16:01:06 -0800 |
| commit | b814da891e8261b909fc5d9fb07b4e8b13989c2d (patch) | |
| tree | 20bdca746012df5441dbfc5bdaab9a75e9649c7d /diff.h | |
| parent | Git 1.8.5.3 (diff) | |
| download | tgif-b814da891e8261b909fc5d9fb07b4e8b13989c2d.tar.xz | |
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 'diff.h')
0 files changed, 0 insertions, 0 deletions