Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Wed, 17 Nov 2010 21:57:58 +0000 (13:57 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 17 Nov 2010 21:57:58 +0000 (13:57 -0800)
commit5a7a0fa...8f964b5ad179018d6a50f25ef7550f97
tree126f139...f83cbddc7b67b70f25348b282944a772copy hash to clipboard (tree)
parentd6b634f...fdb5570d9c25d5176d3d32fe0b22530dcopy hash to clipboard (diff)
parent1c7d402...3e1e9d7e50abfbfb18c88bc79be468eacopy hash to clipboard (diff)
Documentation/diff-options.txt