[PATCH v2 1/5] rebase with preserve merges should not show merged commits
- From
- Jörg Sommer <joerg@alea.gnuu.de>
- Date
- Mar 22, 2008, 14:08 UTC
- Message-ID
- <1206194907-3340-1-git-send-email-joerg@alea.gnuu.de>
- In-Reply-To
- <1206148785-29466-1-git-send-email-joerg@alea.gnuu.de>
The current version of git-rebase--interactive shows the user the commits coming from a merge.
M---A---B \ \ o---o---+---o branch
Rebasing branch on M with preserve merges gives the commits A and B. But if you mark them for editing or remove them the rebase fails. You must keep them as they are. It's useless to bother the user with these commits and might lead to mistakes.
Signed-off-by: Jörg Sommer <joerg@alea.gnuu.de> --- git-rebase--interactive.sh | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 8aa7371..e1ce44e 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -162,6 +162,8 @@ pick_one_preserving_merges () { new_parents="$new_parents $new_p" ;; esac + else + new_parents="$new_parents $p" fi done case $fast_forward in @@ -513,7 +515,7 @@ do echo $ONTO > "$REWRITTEN"/$c || die "Could not init rewritten commits" done - MERGES_OPTION= + MERGES_OPTION=--first-parent else MERGES_OPTION=--no-merges fi
-- 1.5.4.4