From: Vincent van Ravesteijn <vfr@lyx.org>
To: lei yang <yanglei.fage@gmail.com>
Cc: git-users@googlegroups.com, tfnico@gmail.com, git@vger.kernel.org
Subject: Re: [git-users] Re: how to get the formated patches from the merge id
Date: Fri, 15 Jun 2012 13:59:22 +0200 [thread overview]
Message-ID: <4FDB239A.9070803@lyx.org> (raw)
In-Reply-To: <CAHsH0E995C2Fsiyr=MZOH2VyN=mFvnWjrV=6LWkfv-YLy+2RjQ@mail.gmail.com>
Op 15-6-2012 13:46, lei yang schreef:
> Hi
>
> I mean,
>
> I have a commit like below
> commit 0e93b4b304ae052ba1bc73f6d34a68556fe93429
> Merge: b724cc1 51bfd29
>
> This commit done this work: merge b724cc1..51bfd29 commit,
>
> The question is how could I *onlys* through
> 0e93b4b304ae052ba1bc73f6d34a68556fe93429 to get the formated patch for
> the
> commit(b724cc1..51bfd29)
It is still not clear what you want to accomplish.
Your proposal: "git format-patch b724cc1..51bfd29" only gives you the
commits that were in the branch 51bfd29 that weren't yet in the branch
b724cc1. This just reflect the commits of one of the branches, but not
the "work done by the merge commit".
If this is really what you want you can do:
$ git format-patch 0e93b4b3^1..0e93b4b3^2
0e93b4b3^1 means the first parent of 0e93b4b3, which is b724cc1.
0e93b4b3^2 means the second parent, which is 51bfd29
HTH,
Vincent
next prev parent reply other threads:[~2012-06-15 11:59 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-14 16:25 how to get the formated patches from the merge id lei yang
[not found] ` <CAHsH0E98t7EcvXM0zSjMGHcd5u4_Lp6B7q9KAhcE0eyo-tXnWw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2012-06-15 8:02 ` Thomas Ferris Nicolaisen
[not found] ` <9579793f-d72f-424c-9546-f2caa1fbf847-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org>
2012-06-15 11:46 ` lei yang
2012-06-15 11:59 ` Vincent van Ravesteijn [this message]
[not found] ` <4FDB239A.9070803-0hXrFu2P2+c@public.gmane.org>
2012-06-15 12:56 ` lei yang
2012-06-15 13:11 ` [git-users] " Vincent van Ravesteijn
[not found] ` <CAHsH0E995C2Fsiyr=MZOH2VyN=mFvnWjrV=6LWkfv-YLy+2RjQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2012-06-15 12:28 ` Konstantin Khomoutov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4FDB239A.9070803@lyx.org \
--to=vfr@lyx.org \
--cc=git-users@googlegroups.com \
--cc=git@vger.kernel.org \
--cc=tfnico@gmail.com \
--cc=yanglei.fage@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).