Merge branch 'jc/doc-merge-options' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 5 Mar 2012 22:28:14 +0000 (14:28 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 5 Mar 2012 22:28:14 +0000 (14:28 -0800)
commitbb8cbe7861546a0646d38d7cd49dc245001ec5c5
tree926a5f279c1ab6036e440dd9813f3544aba2ec67
parent0e20414f106e22fb13aa4d00201dbeb7422b83fb
parent690b29758289ac81062159c178b6d917f06e9862
Merge branch 'jc/doc-merge-options' into maint

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