Revision eb8dc05c3d364174a6b694e2850ffd6cfe32c6d3 authored by Paul Tan on 18 May 2015, 13:45:41 UTC, committed by Junio C Hamano on 18 May 2015, 18:22:27 UTC
Since b814da8 (pull: add pull.ff configuration, 2014-01-15), running git-pull with the configuration pull.ff=false or pull.ff=only is equivalent to passing --no-ff and --ff-only to git-merge. However, if pull.ff=true, no switch is passed to git-merge. This leads to the confusing behavior where pull.ff=false or pull.ff=only is able to override merge.ff, while pull.ff=true is unable to. Fix this by adding the --ff switch if pull.ff=true, and add a test to catch future regressions. Furthermore, clarify in the documentation that pull.ff overrides merge.ff. Signed-off-by: Paul Tan <pyokagan@gmail.com> Reviewed-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 3d4a3ff
| File | Mode | Size |
|---|---|---|
| Git | ||
| .gitignore | -rw-r--r-- | 79 bytes |
| Git.pm | -rw-r--r-- | 43.7 KB |
| Makefile | -rw-r--r-- | 2.2 KB |
| Makefile.PL | -rw-r--r-- | 1.6 KB |
| private-Error.pm | -rw-r--r-- | 18.6 KB |
Computing file changes ...
