| commit | dcf1d13028f1135d8e87e2e84b382efd95d7605a | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 23 Feb 2012 22:06:31 +0000 (23 14:06 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 23 Feb 2012 22:06:31 +0000 (23 14:06 -0800) | ||
| tree | 698584adffd4e760ce87e88081f32ab79382506f | treesnapshot (tar.gz zip) |
| parent | b2c160509a34e776ce327f16677a3c6fd0796c89 | commitdiff |
| parent | 690b29758289ac81062159c178b6d917f06e9862 | commitdiff |
Merge branch 'jc/doc-merge-options' into next
* jc/doc-merge-options:
Documentation/merge-options.txt: group "ff" related options together
* jc/doc-merge-options:
Documentation/merge-options.txt: group "ff" related options together
| Documentation/merge-options.txt | diff1 | diff2 | blobhistory |