Merge branch 'th/doc-diff-submodule-option'
commitc58499c317ccb04aba4e0c5b3bee78683027f095
authorJunio C Hamano <gitster@pobox.com>
Fri, 16 Mar 2012 04:54:30 +0000 (15 21:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 16 Mar 2012 04:54:31 +0000 (15 21:54 -0700)
tree4496df4b21e42d6a483426192f7bc6b33384d4e7
parent0e2d57fd50f61e668be3180bc8f25991ea88aa8c
parent3fe271e91b4d1b9ed0b304e218df8fd419012107
Merge branch 'th/doc-diff-submodule-option'

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