diff options
| author | Michele Ballabio <barra_cuda@katamail.com> | 2009-03-18 23:53:39 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-19 05:24:51 +0300 |
| commit | 5e75d56f1182c99364c9f5375665c814985f384d (patch) | |
| tree | c9eea669a864033d8b0eb4fbf9b95648fc95836e /Documentation/git-rebase.txt | |
| parent | b130a72b274441bb5d687de93efef4d990c40c0a (diff) | |
document --force-rebase
Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-rebase.txt')
| -rw-r--r-- | Documentation/git-rebase.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 57bd333f0b..276f1510c6 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -258,6 +258,13 @@ OPTIONS context exist they all must match. By default no context is 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>:: This flag is passed to the 'git-apply' program (see linkgit:git-apply[1]) that applies the patch. |