diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-03-19 17:47:52 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-03-19 17:47:52 +0000 |
| commit | a973f1cb10e5189f7dc9fb2c554e13a9ed9347e8 (patch) | |
| tree | 26f37b071c9caac9cf7a6bc84595821434414c68 /git-rebase.txt | |
| parent | d257cff3f36bed19f10bf4ede322157681256e9d (diff) | |
| download | git-htmldocs-a973f1cb10e5189f7dc9fb2c554e13a9ed9347e8.tar.gz | |
Autogenerated HTML docs for v1.6.2.1-222-g570cc
Diffstat (limited to 'git-rebase.txt')
| -rw-r--r-- | git-rebase.txt | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index 57bd333f0..3d5a066c3 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -258,11 +258,23 @@ 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. Incompatible with the --interactive option. +--committer-date-is-author-date:: +--ignore-date:: + These flags are passed to 'git-am' to easily change the dates + of the rebased commits (see linkgit:git-am[1]). + -i:: --interactive:: Make a list of the commits which are about to be rebased. Let the |