From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 5 Oct 2015 19:30:26 +0000 (-0700)
Subject: Merge branch 'mm/keyid-docs'
X-Git-Tag: v2.7.0-rc0~130
X-Git-Url: http://git.bitbasher.net/?a=commitdiff_plain;h=e13d854322ad802213aea13409505c765b5c68d1;p=git.git

Merge branch 'mm/keyid-docs'

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

e13d854322ad802213aea13409505c765b5c68d1