Merge branch 'th/doc-diff-submodule-option' into next
commit0e1d75524b40f27ac84e60df5c8ccc9a87753e8f
authorJunio C Hamano <gitster@pobox.com>
Wed, 14 Mar 2012 23:00:23 +0000 (14 16:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Mar 2012 23:00:23 +0000 (14 16:00 -0700)
tree600d62f3594f2c807643251bb2fb965e8876e20e
parentd54562e98d9be5e89c7d8e8828eb3d6369d42653
parent3fe271e91b4d1b9ed0b304e218df8fd419012107
Merge branch 'th/doc-diff-submodule-option' into next

Update "diff --submodule" documentation.

* th/doc-diff-submodule-option:
  Documentation/diff-options: reword description of --submodule option
Documentation/diff-options.txt