git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* how to get the formated patches from the merge id
@ 2012-06-14 16:25 lei yang
       [not found] ` <CAHsH0E98t7EcvXM0zSjMGHcd5u4_Lp6B7q9KAhcE0eyo-tXnWw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
  0 siblings, 1 reply; 7+ messages in thread
From: lei yang @ 2012-06-14 16:25 UTC (permalink / raw)
  To: git-users-/JYPxA39Uh5TLH3MbocFFw, git-u79uwXL29TY76Z2rM5mHXA

Hello list:

eg:

commit 0e93b4b304ae052ba1bc73f6d34a68556fe93429
Merge: b724cc1 51bfd29

how can I from 0e93b4b304ae052ba1bc73f6d34a68556fe93429 to get the
formated patch ?
(I know we can do git format-patch b724cc1..51bfd29, but how to from
0e93b4b304ae052ba1bc73f6d34a68556fe93429 to get?)

Lei

-- 
You received this message because you are subscribed to the Google Groups "Git for human beings" group.
To post to this group, send email to git-users-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org
To unsubscribe from this group, send email to git-users+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org
For more options, visit this group at http://groups.google.com/group/git-users?hl=en.

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: how to get the formated patches from the merge id
       [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>
  0 siblings, 1 reply; 7+ messages in thread
From: Thomas Ferris Nicolaisen @ 2012-06-15  8:02 UTC (permalink / raw)
  To: git-users-/JYPxA39Uh5TLH3MbocFFw; +Cc: git-u79uwXL29TY76Z2rM5mHXA

[-- Attachment #1: Type: text/plain, Size: 1013 bytes --]

I don't really understand what you're trying to do here. Could you try 
explaining in a little more detail?

On Thursday, June 14, 2012 6:25:12 PM UTC+2, lei yang wrote:
>
> Hello list: 
>
> eg: 
>
> commit 0e93b4b304ae052ba1bc73f6d34a68556fe93429 
> Merge: b724cc1 51bfd29 
>
> how can I from 0e93b4b304ae052ba1bc73f6d34a68556fe93429 to get the 
> formated patch ? 
> (I know we can do git format-patch b724cc1..51bfd29, but how to from 
> 0e93b4b304ae052ba1bc73f6d34a68556fe93429 to get?) 
>
> Lei 
>

-- 
You received this message because you are subscribed to the Google Groups "Git for human beings" group.
To view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/kVcX-TK_VowJ.
To post to this group, send email to git-users-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org
To unsubscribe from this group, send email to git-users+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org
For more options, visit this group at http://groups.google.com/group/git-users?hl=en.


[-- Attachment #2: Type: text/html, Size: 1292 bytes --]

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: Re: how to get the formated patches from the merge id
       [not found]     ` <9579793f-d72f-424c-9546-f2caa1fbf847-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org>
@ 2012-06-15 11:46       ` lei yang
  2012-06-15 11:59         ` [git-users] " Vincent van Ravesteijn
       [not found]         ` <CAHsH0E995C2Fsiyr=MZOH2VyN=mFvnWjrV=6LWkfv-YLy+2RjQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
  0 siblings, 2 replies; 7+ messages in thread
From: lei yang @ 2012-06-15 11:46 UTC (permalink / raw)
  To: git-users-/JYPxA39Uh5TLH3MbocFFw, tfnico-Re5JQEeQqe8AvxtiuMwx3w
  Cc: git-u79uwXL29TY76Z2rM5mHXA

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)

Lei


On Fri, Jun 15, 2012 at 4:02 PM, Thomas Ferris Nicolaisen
<tfnico-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
> I don't really understand what you're trying to do here. Could you try
> explaining in a little more detail?
>
>
> On Thursday, June 14, 2012 6:25:12 PM UTC+2, lei yang wrote:
>>
>> Hello list:
>>
>> eg:
>>
>> commit 0e93b4b304ae052ba1bc73f6d34a68556fe93429
>> Merge: b724cc1 51bfd29
>>
>> how can I from 0e93b4b304ae052ba1bc73f6d34a68556fe93429 to get the
>> formated patch ?
>> (I know we can do git format-patch b724cc1..51bfd29, but how to from
>> 0e93b4b304ae052ba1bc73f6d34a68556fe93429 to get?)
>>
>> Lei
>
> --
> You received this message because you are subscribed to the Google Groups
> "Git for human beings" group.
> To view this discussion on the web visit
> https://groups.google.com/d/msg/git-users/-/kVcX-TK_VowJ.
> To post to this group, send email to git-users-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org
> To unsubscribe from this group, send email to
> git-users+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org
> For more options, visit this group at
> http://groups.google.com/group/git-users?hl=en.

-- 
You received this message because you are subscribed to the Google Groups "Git for human beings" group.
To post to this group, send email to git-users-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org
To unsubscribe from this group, send email to git-users+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org
For more options, visit this group at http://groups.google.com/group/git-users?hl=en.

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [git-users] Re: how to get the formated patches from the merge id
  2012-06-15 11:46       ` lei yang
@ 2012-06-15 11:59         ` Vincent van Ravesteijn
       [not found]           ` <4FDB239A.9070803-0hXrFu2P2+c@public.gmane.org>
       [not found]         ` <CAHsH0E995C2Fsiyr=MZOH2VyN=mFvnWjrV=6LWkfv-YLy+2RjQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
  1 sibling, 1 reply; 7+ messages in thread
From: Vincent van Ravesteijn @ 2012-06-15 11:59 UTC (permalink / raw)
  To: lei yang; +Cc: git-users, tfnico, git

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

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: Re: how to get the formated patches from the merge id
       [not found]         ` <CAHsH0E995C2Fsiyr=MZOH2VyN=mFvnWjrV=6LWkfv-YLy+2RjQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
@ 2012-06-15 12:28           ` Konstantin Khomoutov
  0 siblings, 0 replies; 7+ messages in thread
From: Konstantin Khomoutov @ 2012-06-15 12:28 UTC (permalink / raw)
  To: lei yang
  Cc: git-users-/JYPxA39Uh5TLH3MbocFFw, tfnico-Re5JQEeQqe8AvxtiuMwx3w,
	git-u79uwXL29TY76Z2rM5mHXA

On Fri, 15 Jun 2012 19:46:22 +0800
lei yang <yanglei.fage-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:

> I have a commit like below
> commit 0e93b4b304ae052ba1bc73f6d34a68556fe93429
> Merge: b724cc1 51bfd29
> 
> This commit done this work: merge b724cc1..51bfd29 commit,
This is a gross misunderstanding of how revision ranges work in Git.
Please read the "gitrevisions" manual page.
More precisely, the A..B notation means "All commits reachable from B
excluding those reachable from A".
A merge means that two lines of history (those ending with commits
b724cc1 and 51bfd29, respectively) are merged together.
Writing this as b724cc1..51bfd29 is incorrect and confusing for
the readers.

> The question is how could I *onlys* through
> 0e93b4b304ae052ba1bc73f6d34a68556fe93429 to get the formated patch for
> the commit(b724cc1..51bfd29)
This phrase again missies a predicate (a verb) so we consistently
fail to comprehend your intent.
You could try to find a colleague with a bit better English skill and
ask his/her to provide a better translation so we're able to understan
it.
Also try to get rid of that ".." notation as it seems to ruin your
attempts to get us understand the matter.

-- 
You received this message because you are subscribed to the Google Groups "Git for human beings" group.
To post to this group, send email to git-users-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org
To unsubscribe from this group, send email to git-users+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org
For more options, visit this group at http://groups.google.com/group/git-users?hl=en.

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: Re: how to get the formated patches from the merge id
       [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
  0 siblings, 1 reply; 7+ messages in thread
From: lei yang @ 2012-06-15 12:56 UTC (permalink / raw)
  To: Vincent van Ravesteijn
  Cc: git-users-/JYPxA39Uh5TLH3MbocFFw, tfnico-Re5JQEeQqe8AvxtiuMwx3w,
	git-u79uwXL29TY76Z2rM5mHXA

On Fri, Jun 15, 2012 at 7:59 PM, Vincent van Ravesteijn <vfr-0hXrFu2P2+c@public.gmane.org> wrote:
> 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".
>


but,git format-patch b724cc1..51bfd29 do the same work as what you
said "git format-patch 0e93b4b3^1..0e93b4b3^2"
so this do the same thing, formated patch which merged, can you give a
try to explain it in your workspace. and I don't understand what you
said "branch 51bfd29",51bfd29 is not the branch

Thanks for your help,git format-patch 0e93b4b3^1..0e93b4b3^2 is what I need.

Lei





> 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

-- 
You received this message because you are subscribed to the Google Groups "Git for human beings" group.
To post to this group, send email to git-users-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org
To unsubscribe from this group, send email to git-users+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org
For more options, visit this group at http://groups.google.com/group/git-users?hl=en.

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [git-users] Re: how to get the formated patches from the merge id
  2012-06-15 12:56             ` lei yang
@ 2012-06-15 13:11               ` Vincent van Ravesteijn
  0 siblings, 0 replies; 7+ messages in thread
From: Vincent van Ravesteijn @ 2012-06-15 13:11 UTC (permalink / raw)
  To: lei yang; +Cc: git

Op 15-6-2012 14:56, lei yang schreef:
> On Fri, Jun 15, 2012 at 7:59 PM, Vincent van Ravesteijn<vfr@lyx.org>  wrote:
>> 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".
>>
>
> but,git format-patch b724cc1..51bfd29 do the same work as what you
> said "git format-patch 0e93b4b3^1..0e93b4b3^2"

Yes, that's why I said "If this is _really_ what you want, you can do ...".


> and I don't understand what you
> said "branch 51bfd29",51bfd29 is not the branch

I assumed that the merge commit, merged two branches, but I have no clue 
how they were named. That's why I refer to the branch as the branch 
which had 51bfd29 as the last commit before the merge.

Vincent

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2012-06-15 13:12 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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         ` [git-users] " Vincent van Ravesteijn
     [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

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).