From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 22 Jul 2014 17:16:50 +0000 (-0700)
Subject: Merge branch 'maint-1.8.5' into maint-1.9
X-Git-Tag: v2.0.3~18^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d31f3ad23dd1aee3c3e1015a43b02b995c01a9a1?hp=-c

Merge branch 'maint-1.8.5' into maint-1.9

* maint-1.8.5:
Documentation: fix missing text for rev-parse --verify
---

d31f3ad23dd1aee3c3e1015a43b02b995c01a9a1
diff --combined Documentation/git-rev-parse.txt
index 0d2cdcde55,3cf0ce8b91..55ea1a037d
--- a/Documentation/git-rev-parse.txt
+++ b/Documentation/git-rev-parse.txt
@@@ -50,10 -50,6 +50,10 @@@ Options for --parseop
  	the first non-option argument.  This can be used to parse sub-commands
  	that take options themselves.
  
 +--stuck-long::
 +	Only meaningful in `--parseopt` mode. Output the options in their
 +	long form if available, and with their arguments stuck.
 +
  Options for Filtering
  ~~~~~~~~~~~~~~~~~~~~~
  
@@@ -102,7 -98,7 +102,7 @@@ eval "set -- $(git rev-parse --sq --pre
  +
  If you want to make sure that the output actually names an object in
  your object database and/or can be used as a specific type of object
- you require, you can add "^{type}" peeling operator to the parameter.
+ you require, you can add "\^{type}" peeling operator to the parameter.
  For example, `git rev-parse "$VAR^{commit}"` will make sure `$VAR`
  names an existing object that is a commit-ish (i.e. a commit, or an
  annotated tag that points at a commit).  To make sure that `$VAR`
@@@ -177,20 -173,6 +177,20 @@@ shown.  If the pattern does not contai
  	character (`?`, `*`, or `[`), it is turned into a prefix
  	match by appending `/*`.
  
 +--exclude=<glob-pattern>::
 +	Do not include refs matching '<glob-pattern>' that the next `--all`,
 +	`--branches`, `--tags`, `--remotes`, or `--glob` would otherwise
 +	consider. Repetitions of this option accumulate exclusion patterns
 +	up to the next `--all`, `--branches`, `--tags`, `--remotes`, or
 +	`--glob` option (other options or arguments do not clear
 +	accumlated patterns).
 ++
 +The patterns given should not begin with `refs/heads`, `refs/tags`, or
 +`refs/remotes` when applied to `--branches`, `--tags`, or `--remotes`,
 +respectively, and they must begin with `refs/` when applied to `--glob`
 +or `--all`. If a trailing '/{asterisk}' is intended, it must be given
 +explicitly.
 +
  --disambiguate=<prefix>::
  	Show every object whose name begins with the given prefix.
  	The <prefix> must be at least 4 hexadecimal digits long to
@@@ -303,9 -285,7 +303,9 @@@ Each line of options has this format
  	`<flags>` are of `*`, `=`, `?` or `!`.
  	* Use `=` if the option takes an argument.
  
 -	* Use `?` to mean that the option is optional (though its use is discouraged).
 +	* Use `?` to mean that the option takes an optional argument. You
 +	  probably want to use the `--stuck-long` mode to be able to
 +	  unambiguously parse the optional argument.
  
  	* Use `*` to mean that this option should not be listed in the usage
  	  generated for the `-h` argument. It's shown for `--help-all` as