projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fe048e4 27fd1e4)
Merge branch 'en/merge-options-ff-and-friends'
authorJunio C Hamano <gitster@pobox.com>
Mon, 30 Sep 2019 04:19:28 +0000 (13:19 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 30 Sep 2019 04:19:28 +0000 (13:19 +0900)
commit9bc67b6658a031b92cba4a7489b78a4da902ecbf
tree920dfd82ae9649a66fca03b6c0bf9b6b89e0bce8tree | snapshot
parentfe048e4fd905e5c45b07381339ef627f57cf0822commit | diff
parent27fd1e4ea70f3787c016f3b7ab75c52aa11a753dcommit | diff
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
Documentation/merge-options.txt diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.