summaryrefslogtreecommitdiffstats
path: root/git-rebase.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2009-08-22 05:10:47 +0000
committerJunio C Hamano <junio@hera.kernel.org>2009-08-22 05:10:47 +0000
commitfe24db05d4bb032effbd10c0ef1e4ad11d09c07c (patch)
tree3a575878892ba149206ecb05915d300634fc0828 /git-rebase.txt
parent0df868a88d19f43e96bbc693a53567a4219ed96b (diff)
downloadgit-htmldocs-fe24db05d4bb032effbd10c0ef1e4ad11d09c07c.tar.gz
Autogenerated HTML docs for v1.6.4.1-174-g32f4c
Diffstat (limited to 'git-rebase.txt')
-rw-r--r--git-rebase.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/git-rebase.txt b/git-rebase.txt
index db1b71d24..0aefc34d0 100644
--- a/git-rebase.txt
+++ b/git-rebase.txt
@@ -268,8 +268,9 @@ OPTIONS
exit with the message "Current branch is up to date" in such a
situation.
+--ignore-whitespace::
--whitespace=<option>::
- This flag is passed to the 'git-apply' program
+ These flag are passed to the 'git-apply' program
(see linkgit:git-apply[1]) that applies the patch.
Incompatible with the --interactive option.