git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fe048e4 27fd1e4)
Merge branch 'en/merge-options-ff-and-friends'
authorJunio C Hamano <redacted>
Mon, 30 Sep 2019 04:19:28 +0000 (13:19 +0900)
committerJunio C Hamano <redacted>
Mon, 30 Sep 2019 04:19:28 +0000 (13:19 +0900)
Doc update.

* en/merge-options-ff-and-friends:
  merge-options.txt: clarify meaning of various ff-related options

1  2 
Documentation/merge-options.txt patch | diff1 | diff2 | blob | history

diff --cc Documentation/merge-options.txt
Simple merge
git clone https://git.99rst.org/PROJECT