From f8cca019b9ea9471719505ca6ccf020feb219d98 Mon Sep 17 00:00:00 2001 From: Andreas Ericsson Date: Mon, 29 Sep 2008 22:28:57 +0200 Subject: rebase: Support preserving merges in non-interactive mode As a result of implementation details, 'git rebase' could previously only preserve merges in interactive mode. That limitation was hard for users to understand and awkward to explain. This patch works around it by running the interactive rebase helper git-rebase--interactive with GIT_EDITOR set to ':' when the user passes "-p" but not "-i" to the rebase command. The effect is that the interactive rebase helper is used but the user never sees an editor. The test-case included in this patch was originally written by Stephen Habermann , but has been extensively modified since its creation. Signed-off-by: Andreas Ericsson Signed-off-by: Shawn O. Pearce --- Documentation/git-rebase.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Documentation/git-rebase.txt') diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 32f0f122e9..b86e80bb66 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -250,8 +250,7 @@ OPTIONS -p:: --preserve-merges:: - Instead of ignoring merges, try to recreate them. This option - only works in interactive mode. + Instead of ignoring merges, try to recreate them. include::merge-strategies.txt[] -- cgit v1.2.3