@matheusbsbs / matheus-bagliano / commits / a94eda65d3
Fork 0

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>

Robin Rosenberg committed Sep 1, 2007 at 14:11 UTC a94eda65d37149e81356b6a263ce03015d3f5d73
1 file changed +2 -2
Documentation/git-rebase.txt
+2 -2
@@ -8,7 +8,7 @@ git-rebase - Forward-port local commits to the updated upstream head
8 SYNOPSIS
9 --------
10 [verse]
11 -'git-rebase' [-i | --interactive] [-v | --verbose] [--merge] [-C<n>]
11 +'git-rebase' [-i | --interactive] [-v | --verbose] [-m | --merge] [-C<n>]
12 [-p | --preserve-merges] [--onto <newbase>] <upstream> [<branch>]
13 'git-rebase' --continue | --skip | --abort
14
@@ -188,7 +188,7 @@ OPTIONS
188 --skip::
189 Restart the rebasing process by skipping the current patch.
190
191 ---merge::
191 +-m, \--merge::
192 Use merging strategies to rebase. When the recursive (default) merge
193 strategy is used, this allows rebase to be aware of renames on the
194 upstream side.