document --force-rebase

Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michele Ballabio 2009-03-18 21:53:39 +01:00 committed by Junio C Hamano
parent b130a72b27
commit 5e75d56f11

View File

@ -258,6 +258,13 @@ OPTIONS
context exist they all must match. By default no context is context exist they all must match. By default no context is
ever ignored. ever ignored.
-f::
--force-rebase::
Force the rebase even if the current branch is a descendant
of the commit you are rebasing onto. Normally the command will
exit with the message "Current branch is up to date" in such a
situation.
--whitespace=<option>:: --whitespace=<option>::
This flag is passed to the 'git-apply' program This flag is passed to the 'git-apply' program
(see linkgit:git-apply[1]) that applies the patch. (see linkgit:git-apply[1]) that applies the patch.