My Various Git Projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 75b2f01) | patch
merge-options.txt: clarify meaning of various ff-related options
authorElijah Newren <newren@gmail.com>
Sat, 31 Aug 2019 00:23:13 +0000 (17:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 1 Sep 2019 15:53:39 +0000 (08:53 -0700)
commit27fd1e4ea70f3787c016f3b7ab75c52aa11a753d
tree9e926530f2db7738f94ddac1e1d23fbf784692fbtree | snapshot
parent75b2f01a0f642b39b0f29b6218515df9b5eb798ecommit | diff
merge-options.txt: clarify meaning of various ff-related options

As discovered on the mailing list, some of the descriptions of the
ff-related options were unclear.  Try to be more precise with what these
options do.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/merge-options.txt diff | blob | history
The core git plumbing