From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 13 Apr 2016 21:12:35 +0000 (-0700)
Subject: Merge branch 'es/format-patch-doc-hide-no-patch'
X-Git-Tag: v2.9.0-rc0~125
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/79296749161a422a103b6b13e4762600b94a87bc?ds=inline;hp=-c

Merge branch 'es/format-patch-doc-hide-no-patch'

"git format-patch --help" showed `-s` and `--no-patch` as if these
are valid options to the command.  We already hide `--patch` option
from the documentation, because format-patch is about showing the
diff, and the documentation now hides these options as well.

* es/format-patch-doc-hide-no-patch:
git-format-patch.txt: don't show -s as shorthand for multiple options
---

79296749161a422a103b6b13e4762600b94a87bc
diff --combined Documentation/diff-options.txt
index 32f48ed647,9d0aea50cd..4b0318e2ac
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@@ -26,12 -26,12 +26,12 @@@ ifndef::git-format-patch[
  ifdef::git-diff[]
  	This is the default.
  endif::git-diff[]
- endif::git-format-patch[]
  
  -s::
  --no-patch::
  	Suppress diff output. Useful for commands like `git show` that
  	show the patch by default, or to cancel the effect of `--patch`.
+ endif::git-format-patch[]
  
  -U<n>::
  --unified=<n>::
@@@ -267,9 -267,6 +267,9 @@@ expression to make sure that it matche
  A match that contains a newline is silently truncated(!) at the
  newline.
  +
 +For example, `--word-diff-regex=.` will treat each character as a word
 +and, correspondingly, show differences character by character.
 ++
  The regex can also be set via a diff driver or configuration option, see
  linkgit:gitattributes[1] or linkgit:git-config[1].  Giving it explicitly
  overrides any diff driver or configuration setting.  Diff drivers
@@@ -286,24 -283,14 +286,24 @@@ endif::git-format-patch[
  
  ifndef::git-format-patch[]
  --check::
 -	Warn if changes introduce whitespace errors.  What are
 -	considered whitespace errors is controlled by `core.whitespace`
 +	Warn if changes introduce conflict markers or whitespace errors.
 +	What are considered whitespace errors is controlled by `core.whitespace`
  	configuration.  By default, trailing whitespaces (including
  	lines that solely consist of whitespaces) and a space character
  	that is immediately followed by a tab character inside the
  	initial indent of the line are considered whitespace errors.
  	Exits with non-zero status if problems are found. Not compatible
  	with --exit-code.
 +
 +--ws-error-highlight=<kind>::
 +	Highlight whitespace errors on lines specified by <kind>
 +	in the color specified by `color.diff.whitespace`.  <kind>
 +	is a comma separated list of `old`, `new`, `context`.  When
 +	this option is not given, only whitespace errors in `new`
 +	lines are highlighted.  E.g. `--ws-error-highlight=new,old`
 +	highlights whitespace errors on both deleted and added lines.
 +	`all` can be used as a short-hand for `old,new,context`.
 +
  endif::git-format-patch[]
  
  --full-index::