I have tried git diff master... which also have this issue, the cherry-picked change is showing in the output.
2012/8/28 Fred <fredgarlo...@gmail.com> > > > On Tuesday, August 28, 2012 3:26:15 PM UTC+2, Michael Wang wrote: >> >> try git rev-list, following is an exmaple: >> >> loveky@LOVEKY-PC ~/test/test (dev) >> $ git log --oneline master >> 1874792 4 >> 8ed7a1e 3 >> a224756 2 >> 34b4b11 1 >> >> loveky@LOVEKY-PC ~/test/test (dev) >> $ git log --oneline dev >> fd0c922 5 >> a224756 2 >> 34b4b11 1 >> >> loveky@LOVEKY-PC ~/test/test (dev) >> $ git rev-list master..dev >> fd0c9223561e9d034a4401bb7cf82a**aeee19723b >> > > > git rev-list ist great, but it doesn't work for cherry picked commits > > do a cherry-pick commit from branchB into master. git rev-list > master..branchB would show sha1 of the commit in branchB. > But the change itself is already in master (cherry-picked and has diffrent > sha1) > > >> >> 2012/8/28 Fred <fredga...@gmail.com> >> >>> >>> >>> On Tuesday, August 28, 2012 1:15:08 PM UTC+2, Tim Chase wrote: >>>> >>>> On 08/28/12 05:47, Tim Chase wrote: >>>> > On 08/28/12 03:13, Fred wrote: >>>> >> is there a way to check if a branch doesn't introduce changes, >>>> >> which are not in master. >>>> > >>>> > I'm partial to >>>> > >>>> > git diff my_branch ^master >>>> > >>>> > which would find all the changes on "my_branch" that aren't yet on >>>> > master. This is an open syntax so you can request "changes that are >>>> > on my_branch_a, but aren't on master or on my_branch_b" with >>>> > >>>> > git diff my_branch_a ^my_branch_b ^master >>>> >>>> Additionally, I find the "diff" version somewhat hard to read unless >>>> the delta is small, but the same syntax works for log: >>>> >>>> git log my_branch ^master ^my_branch_b >>>> >>>> which can give you a higher level view of the changes. >>>> >>> >>> >>> Hm. Maybe I've explained it wrong way. Let's say, my_branch is in sync >>> with master >>> I do commit in master, so the master is ahead of my_branch by one >>> commit. >>> >>> git diff my_branch ^master would show a diff for this last commit and >>> that is not what I want. In that case it is ok master differs from >>> my_branch. >>> >>> What I want to detect is following: >>> my_branch is in sync with master. Then there are some or none commits in >>> master and one commit into my_branch. >>> I want identify the commit into my_branch, because the change is not in >>> master >>> >>> Thanks for help! >>> >>> >>>> -tkc >>>> >>>> >>>> -- >>> 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/-/GgdqxnD0yF8J<https://groups.google.com/d/msg/git-users/-/GgdqxnD0yF8J> >>> . >>> >>> To post to this group, send email to git-...@googlegroups.com. >>> To unsubscribe from this group, send email to git-users+...@** >>> googlegroups.com. >>> >>> For more options, visit this group at http://groups.google.com/** >>> group/git-users?hl=en <http://groups.google.com/group/git-users?hl=en>. >>> >> >> >> >> -- >> Michael Wang >> Unix/Linux Admin | Software Configuration Management >> MSN: ylz...@gmail.com >> Blog: http://loveky2012.**blogspot.com <http://loveky2012.blogspot.com/> >> 命由己作，福由心生；积善之家，必有余庆； >> >> -- > 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/-/D8HhGyrU0sgJ. > > 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. > -- Michael Wang Unix/Linux Admin | Software Configuration Management MSN: ylzc...@gmail.com Blog: http://loveky2012.blogspot.com 命由己作，福由心生；积善之家，必有余庆； -- 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.
