diff options
author | Paul Tan <pyokagan@gmail.com> | 2015-05-18 16:45:41 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-05-18 21:22:27 +0300 |
commit | eb8dc05c3d364174a6b694e2850ffd6cfe32c6d3 (patch) | |
tree | f462cc65dabea04bdf6e6ea0441bbca279899ede /pathspec.h | |
parent | 3d4a3ffe64162b45ae7c991fc60623ecb4678cfd (diff) |
pull: make pull.ff=true override merge.ff
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>
Diffstat (limited to 'pathspec.h')
0 files changed, 0 insertions, 0 deletions