Robin Rosenberg  committed a94eda6

Mention -m as an abbreviation for --merge

Signed-off-by: Robin Rosenberg <>
Signed-off-by: Junio C Hamano <>

  • Participants
  • Parent commits 947ad2e

Comments (0)

Files changed (1)

File Documentation/git-rebase.txt

-'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
 	Restart the rebasing process by skipping the current patch.
+-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.