From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 3 Nov 2015 23:32:37 +0000 (-0800)
Subject: Merge branch 'rt/placeholder-in-usage' into maint
X-Git-Tag: v2.6.3~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=14f905caf2da593a65a2be51ff4d219e5cc3de04;p=thirdparty%2Fgit.git

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
---

14f905caf2da593a65a2be51ff4d219e5cc3de04