diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-09-02 06:25:16 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-09-02 06:25:16 +0000 |
| commit | c5653d7925386e4ffaf82750f0bae29b20145649 (patch) | |
| tree | 70b8105fa17f3c5f0b741cff507b8f4b7e15495f /git-rebase.txt | |
| parent | dbb64591ddf30b577662e7021a39b24b3fac6177 (diff) | |
| download | git-htmldocs-c5653d7925386e4ffaf82750f0bae29b20145649.tar.gz | |
Autogenerated HTML docs for v1.5.3
Diffstat (limited to 'git-rebase.txt')
| -rw-r--r-- | git-rebase.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index 640ea3b38..61b1810db 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -8,7 +8,7 @@ git-rebase - Forward-port local commits to the updated upstream head SYNOPSIS -------- [verse] -'git-rebase' [-i | --interactive] [-v | --verbose] [--merge] [-C<n>] +'git-rebase' [-i | --interactive] [-v | --verbose] [-m | --merge] [-C<n>] [-p | --preserve-merges] [--onto <newbase>] <upstream> [<branch>] 'git-rebase' --continue | --skip | --abort @@ -188,7 +188,7 @@ OPTIONS --skip:: Restart the rebasing process by skipping the current patch. ---merge:: +-m, \--merge:: Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side. |