commit | bb8cbe7861546a0646d38d7cd49dc245001ec5c5 | [log] [tgz] |
---|---|---|
author | Junio C Hamano <gitster@pobox.com> | Mon Mar 05 14:28:14 2012 -0800 |
committer | Junio C Hamano <gitster@pobox.com> | Mon Mar 05 14:28:14 2012 -0800 |
tree | 926a5f279c1ab6036e440dd9813f3544aba2ec67 | |
parent | 0e20414f106e22fb13aa4d00201dbeb7422b83fb [diff] | |
parent | 690b29758289ac81062159c178b6d917f06e9862 [diff] |
Merge branch 'jc/doc-merge-options' into maint * jc/doc-merge-options: Documentation/merge-options.txt: group "ff" related options together