From: Todd Zullinger <tmz@pobox.com>
Date: Sat, 28 Feb 2009 18:42:02 +0000 (-0500)
Subject: git-rebase: Update --whitespace documentation
X-Git-Tag: v1.6.2~12
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=749485f6225455eefd4a2af31e2c98068f20464d;p=git.git

git-rebase: Update --whitespace documentation

The parameters accepted by the --whitespace option of "git apply" have
changed over time, and the documentation for "git rebase" was out of
sync.  Remove the specific parameter list from the "git rebase"
documentation and simply point to the "git apply" documentation for
details, as is already done in the "git am" documentation.

Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 30487de48..da3c38cd6 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -243,7 +243,7 @@ OPTIONS
 	context exist they all must match.  By default no context is
 	ever ignored.
 
---whitespace=<nowarn|warn|error|error-all|strip>::
+--whitespace=<option>::
 	This flag is passed to the 'git-apply' program
 	(see linkgit:git-apply[1]) that applies the patch.
 	Incompatible with the --interactive option.