diff options
| author | Robin Rosenberg <robin.rosenberg.lists@dewire.com> | 2007-09-01 16:11:10 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-09-01 21:36:56 +0400 |
| commit | a94eda65d37149e81356b6a263ce03015d3f5d73 (patch) | |
| tree | d94c1c5de87aeb759be0ffccbf4decfe358b27f9 /Documentation/git-rebase.txt | |
| parent | 947ad2e1de787deda69b40c7047436c37dc040c7 (diff) | |
Mention -m as an abbreviation for --merge
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-rebase.txt')
| -rw-r--r-- | Documentation/git-rebase.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 640ea3b38d..61b1810dba 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/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. |