undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mention -m as an abbreviation for --merge

Browse Source 
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Robin Rosenberg 2007-09-01 14:11:10 +02:00 committed by Junio C Hamano
parent 947ad2e1de
commit a94eda65d3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/git-rebase.txt
View File

@ -8,7 +8,7 @@ git-rebase - Forward-port local commits to the updated upstream head
SYNOPSIS SYNOPSIS
-------- --------
[verse] [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>] [-p | --preserve-merges] [--onto <newbase>] <upstream> [<branch>]
'git-rebase' --continue | --skip | --abort 'git-rebase' --continue | --skip | --abort
@ -188,7 +188,7 @@ OPTIONS
--skip:: --skip::
Restart the rebasing process by skipping the current patch. Restart the rebasing process by skipping the current patch.
--merge:: -m, \--merge::
Use merging strategies to rebase. When the recursive (default) merge Use merging strategies to rebase. When the recursive (default) merge
strategy is used, this allows rebase to be aware of renames on the strategy is used, this allows rebase to be aware of renames on the
upstream side. upstream side.