![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 6 May 2011 19:27:05 +0000 (12:27 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 6 May 2011 22:12:30 +0000 (15:12 -0700) | ||
| commit | f23e8decd544c8f81b40c98211f6cb028fa70cdc | |
| tree | 46722262fd27b289b619373a331794397f481c1c | tree | snapshot |
| parent | 541d1fa85ca4741e8b6db281f3d788dcfc423bdc | commit | diff |
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>
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>
| Documentation/merge-config.txt | diff | blob | history | |
| builtin/merge.c | diff | blob | history | |
| t/t7600-merge.sh | diff | blob | history |