summaryrefslogtreecommitdiffstats
path: root/git-rebase.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2009-03-01 08:02:50 +0000
committerJunio C Hamano <junio@hera.kernel.org>2009-03-01 08:02:50 +0000
commitf8a792291dcb2d2897c8060f4eed60e1db74375a (patch)
tree553ab788211c7eec025630e54137064d3a076b34 /git-rebase.txt
parentcfd0b9a8ef679fe7cacae3e130b697ce2dfc7314 (diff)
downloadgit-htmldocs-f8a792291dcb2d2897c8060f4eed60e1db74375a.tar.gz
Autogenerated HTML docs for v1.6.2-rc2-16-gf474c
Diffstat (limited to 'git-rebase.txt')
-rw-r--r--git-rebase.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase.txt b/git-rebase.txt
index 30487de48..da3c38cd6 100644
--- a/git-rebase.txt
+++ b/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.