Merge branch 'rt/placeholder-in-usage'
commit0884726b43e356d5710db3d516c788fd0b95a57c
authorJunio C Hamano <gitster@pobox.com>
Mon, 26 Oct 2015 22:55:18 +0000 (26 15:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 26 Oct 2015 22:55:18 +0000 (26 15:55 -0700)
tree566ca60f706c3163afb64ad57dfacf3ab6549bc8
parent97a9e546a27c98512fef39cd457a4da6dbb5063a
parentd96a0313efb7133f07dfe36e3cf9d8a04365b1e1
Merge branch 'rt/placeholder-in-usage'

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