From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 16 Oct 2015 21:32:33 +0000 (-0700)
Subject: Merge branch 'mm/keyid-docs' into maint
X-Git-Tag: v2.6.2~21
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/be4d6f4c7f94541fac1a06e4c04acc2d60de1f8c?hp=--cc

Merge branch 'mm/keyid-docs' into maint

Very small number of options take a parameter that is optional
(which is not a great UI element as they can only appear at the end
of the command line).  Add notice to documentation of each and
every one of them.

* mm/keyid-docs:
Documentation: explain optional arguments better
Documentation/grep: fix documentation of -O
Documentation: use 'keyid' consistently, not 'key-id'
---

be4d6f4c7f94541fac1a06e4c04acc2d60de1f8c