]> granicus.if.org Git - git/commitdiff
projects / git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9db6140 27fd1e4)
Merge branch 'en/merge-options-ff-and-friends' into next
authorJunio C Hamano <gitster@pobox.com>
Mon, 9 Sep 2019 19:58:36 +0000 (12:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 9 Sep 2019 19:58:36 +0000 (12:58 -0700)
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
Unnamed repository; edit this file 'description' to name the repository.