diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-09-10 01:33:28 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-09-10 01:33:28 +0000 |
| commit | 250f03e4da02e3baac97034efeb8d122e0d6b207 (patch) | |
| tree | 90cf2e3b11ba19c97e33240cb24eb56e32994f44 /git-rebase.txt | |
| parent | bfd4f9ac8b0380408e8232157de4c7293c51e667 (diff) | |
| download | git-htmldocs-250f03e4da02e3baac97034efeb8d122e0d6b207.tar.gz | |
Autogenerated HTML docs for v1.5.3.1-27-g57543
Diffstat (limited to 'git-rebase.txt')
| -rw-r--r-- | git-rebase.txt | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index 61b1810db..0858fa8a6 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -8,8 +8,9 @@ git-rebase - Forward-port local commits to the updated upstream head SYNOPSIS -------- [verse] -'git-rebase' [-i | --interactive] [-v | --verbose] [-m | --merge] [-C<n>] - [-p | --preserve-merges] [--onto <newbase>] <upstream> [<branch>] +'git-rebase' [-i | --interactive] [-v | --verbose] [-m | --merge] + [-C<n>] [ --whitespace=<option>] [-p | --preserve-merges] + [--onto <newbase>] <upstream> [<branch>] 'git-rebase' --continue | --skip | --abort DESCRIPTION @@ -209,6 +210,10 @@ OPTIONS context exist they all must match. By default no context is ever ignored. +--whitespace=<nowarn|warn|error|error-all|strip>:: + This flag is passed to the `git-apply` program + (see gitlink:git-apply[1]) that applies the patch. + -i, \--interactive:: Make a list of the commits which are about to be rebased. Let the user edit that list before rebasing. This mode can also be used to |