Merge branch 'wtk/submodule-doc-fixup' into next
commit46becb193bb8bd763e17a9b101a5b6dcb8ae00b0
authorJeff King <peff@peff.net>
Thu, 25 Oct 2012 11:16:07 +0000 (25 07:16 -0400)
committerJeff King <peff@peff.net>
Thu, 25 Oct 2012 11:16:07 +0000 (25 07:16 -0400)
treef91071878ff3c3a680cd33b2bb4203fdaeea8cd2
parent76d91fe3b49d286935b38a435d913439def5f6d0
parent38ae92e4d027063b9b87e51a9bf12809d10066f6
Merge branch 'wtk/submodule-doc-fixup' into next

Minor formatting fixup in submodule docs.

* wtk/submodule-doc-fixup:
  git-submodule: wrap branch option with "<>" in usage strings.

Conflicts:
Documentation/git-submodule.txt
git-submodule.sh
Documentation/git-submodule.txt
git-submodule.sh