Re: rebase converts merge commits

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Subject: Re: rebase converts merge commits
From: Matthijs Kooijman <matthijs@xxxxxxxx>
Date: Tue, 12 Oct 2010 16:58:25 +0200
Cc: git@xxxxxxxxxxxxxxx
In-reply-to: <AANLkTikz0yUv9+EcT-kVwniUf9xnRe=_y96euNb=stzP@xxxxxxxxxxxxxx>
Mail-followup-to: Sébastien Barthélemy <barthelemy@xxxxxxxxx>, git@xxxxxxxxxxxxxxx
User-agent: Mutt/1.5.18 (2008-05-17)

Hi Sébastien,

> Yet, I have a problem while trying to rebase a bit of history which contains
> merge commits.

Have you tried the --preserve-merges option to rebase?

Gr.

Matthijs

Attachment: signature.asc
Description: Digital signature

Follow-Ups:
- Re: rebase converts merge commits
  - From: Sébastien Barthélemy

References:
- rebase converts merge commits
  - From: Sébastien Barthélemy

Prev by Date: Re: [PATCH 7/7] svn-fe: Use the --report-fd feature
Next by Date: Re: rebase converts merge commits
Previous by thread: rebase converts merge commits
Next by thread: Re: rebase converts merge commits
Index(es):
- Date
- Thread

[Index of Archives] [Linux Kernel Development] [Gcc Help] [IETF Annouce] [DCCP] [Netdev] [Networking] [Security] [V4L] [Bugtraq] [Yosemite] [MIPS Linux] [ARM Linux] [Linux Security] [Linux RAID] [Linux SCSI] [Fedora Users]