Merge branch 'rt/placeholder-in-usage' into maint
commit14f905caf2da593a65a2be51ff4d219e5cc3de04
authorJunio C Hamano <gitster@pobox.com>
Tue, 3 Nov 2015 23:32:37 +0000 (3 15:32 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 3 Nov 2015 23:32:37 +0000 (3 15:32 -0800)
tree3b87dabb59e45bb55e9a9e45a7b2c96e07d67dca
parentccb47391c1e35c5475529cb8f3bd66028df5a943
parentd96a0313efb7133f07dfe36e3cf9d8a04365b1e1
Merge branch 'rt/placeholder-in-usage' into maint

A couple of commands still showed "[options]" in their usage string
to note where options should come on their command line, but we
spell that "[<options>]" in most places these days.

* rt/placeholder-in-usage:
  am, credential-cache: add angle brackets to usage string
builtin/am.c