| commit | 9bc67b6658a031b92cba4a7489b78a4da902ecbf | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 30 Sep 2019 04:19:28 +0000 (30 13:19 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 30 Sep 2019 04:19:28 +0000 (30 13:19 +0900) | ||
| tree | 920dfd82ae9649a66fca03b6c0bf9b6b89e0bce8 | treesnapshot (tar.gz zip) |
| parent | fe048e4fd905e5c45b07381339ef627f57cf0822 | commitdiff |
| parent | 27fd1e4ea70f3787c016f3b7ab75c52aa11a753d | commitdiff |
Merge branch 'en/merge-options-ff-and-friends'
Doc update.
* en/merge-options-ff-and-friends:
merge-options.txt: clarify meaning of various ff-related options
Doc update.
* en/merge-options-ff-and-friends:
merge-options.txt: clarify meaning of various ff-related options
| Documentation/merge-options.txt | diff1 | diff2 | blobhistory |