Re: How to merge in different order?

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

 



On Fri, Apr 3, 2009 at 12:12 PM, Josef Wolf wrote:
> Hello,
>
> Given a branch that looks like
>
>  A1  A2  A3  A4  A5
>
> I would like to merge into another branch in the order
>
>  A1  A3  A4  A2  A5
>
> When I merge A3, then A2 is merged also.  git-merge don't seem
> to have an option to omit slurping older commits?

"git merge" merges the entire branch. It sounds like you are looking
for "git cherry-pick" instead.

Alternatively, you could run "git rebase -i A1" on the branch before
merging it. (See the docs for details)

Peter Harris
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[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]

  Powered by Linux