diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-05-06 12:27:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-06 15:12:30 -0700 |
| commit | f23e8decd544c8f81b40c98211f6cb028fa70cdc (patch) | |
| tree | 46722262fd27b289b619373a331794397f481c1c /sigchain.c | |
| parent | Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-config (diff) | |
| download | tgif-f23e8decd544c8f81b40c98211f6cb028fa70cdc.tar.xz | |
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>
Diffstat (limited to 'sigchain.c')
0 files changed, 0 insertions, 0 deletions