Re: [git-users] Re: how to get the formated patches from the merge id
On Fri, Jun 15, 2012 at 7:59 PM, Vincent van Ravesteijn 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@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
Re: [git-users] Re: how to get the formated patches from the merge id
On Fri, 15 Jun 2012 19:46:22 +0800 lei yang 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@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
Re: [git-users] Re: how to get the formated patches from the merge id
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 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@googlegroups.com. > To unsubscribe from this group, send email to > git-users+unsubscr...@googlegroups.com. > 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@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] Re: how to get the formated patches from the merge id
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@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.