From a94eda65d37149e81356b6a263ce03015d3f5d73 Mon Sep 17 00:00:00 2001 From: Robin Rosenberg Date: Sat, 1 Sep 2007 14:11:10 +0200 Subject: [PATCH] Mention -m as an abbreviation for --merge Signed-off-by: Robin Rosenberg Signed-off-by: Junio C Hamano --- Documentation/git-rebase.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 640ea3b38..61b1810db 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] +'git-rebase' [-i | --interactive] [-v | --verbose] [-m | --merge] [-C] [-p | --preserve-merges] [--onto ] [] '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. -- 2.30.2