Todd ZullingerThe 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> ---
I sent this a few weeks back, but it may have arrived during a particularly busy time and been lost among the many more important patches. :)
Documentation/git-rebase.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
Show changes to Documentation/git-rebase.txt +1 −0
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 30487de..da3c38c 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.
--
1.6.2.rc1
--
Todd OpenPGP -> KeyID: 0xBEAF0CE3 | URL: www.pobox.com/~tmz/pgp
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The power of accurate observation is frequently called cynicism by
those who don't have it.
-- George Bernard Shaw