tree b4280f474cec388974fd48b61f5cac669433a169
parent c7997e54a5dd75803657b25aea101255f388ac08
parent 2b594bf90d84fd96f2b1fe904c1e62e391ceb4a0
author Junio C Hamano <gitster@pobox.com> 1445031153 -0700
committer Junio C Hamano <gitster@pobox.com> 1445031153 -0700

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'