Merge branch 'sn/doc-opt-notation' into maint
commitf7bff60de95951d2c82601350cb3771b347e83ee
authorJunio C Hamano <gitster@pobox.com>
Thu, 21 Oct 2010 23:26:42 +0000 (21 16:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 21 Oct 2010 23:26:42 +0000 (21 16:26 -0700)
tree5c0e747a86d4990b4e5b7176cec670de620dabe8
parent75a2f301676aefb85c4f67da613cad2405e77927
parentd0bb13663000be47d83cbe53b6c4bdc8835625cb
Merge branch 'sn/doc-opt-notation' into maint

* sn/doc-opt-notation:
  Fix {update,checkout}-index usage strings
  Put a space between `<' and argument in pack-objects usage string
  Remove stray quotes in --pretty and --format documentation
  Use parentheses and `...' where appropriate
  Fix odd markup in --diff-filter documentation
  Use angles for placeholders consistently
Documentation/git-show-branch.txt
Documentation/git-update-index.txt
Documentation/git.txt
Documentation/user-manual.txt
git-am.sh