Merge branch 'jc/doc-merge-options'
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Feb 2012 07:05:42 +0000 (23:05 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Feb 2012 07:05:42 +0000 (23:05 -0800)
commit5419127d0475a78983696544ca5e672e8ea4075d
tree70d9782312c8392f1ccf704e33248955c496b04f
parent31e3d834b39b773831c3c3e2637f2d99bfad9cbf
parent690b29758289ac81062159c178b6d917f06e9862
Merge branch 'jc/doc-merge-options'

* jc/doc-merge-options:
  Documentation/merge-options.txt: group "ff" related options together
Documentation/merge-options.txt