From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 19 Sep 2016 20:51:45 +0000 (-0700)
Subject: Merge branch 'ah/misc-message-fixes' into maint
X-Git-Tag: v2.10.1~30
X-Git-Url: http://git.bitbasher.net/?a=commitdiff_plain;h=9f3d73e8cb2e9ae1123c218cc1ecff3032c82286;p=git.git

Merge branch 'ah/misc-message-fixes' into maint

Message cleanup.

* ah/misc-message-fixes:
  unpack-trees: do not capitalize "working"
  git-merge-octopus: do not capitalize "octopus"
  git-rebase--interactive: fix English grammar
  cat-file: put spaces around pipes in usage string
  am: put spaces around pipe in usage string
---

9f3d73e8cb2e9ae1123c218cc1ecff3032c82286