On Tuesday, August 28, 2012 5:13:39 PM UTC+2, donnoman wrote: > > git diff master.. > > Would give you what's in your current branch since master > > git diff ..master > > Would show you commits in master that your local branch doesn't have > > git diff ...master > > Or > > git diff master... > > Would show you all commits that your branch and master do not share > > I only find the 3 dot version useful for identifying that two branches are > entirely equal. >
Looks like git diff master... is what I'm looking for. Thanks! > On Aug 28, 2012, at 6:28 AM, Aneesh Bhasin > <contact...@gmail.com<javascript:>> > wrote: > > > Hi.. > > > > On Tue, Aug 28, 2012 at 6:02 PM, Fred <fredga...@gmail.com <javascript:>> > wrote: > >> > >> > >> 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! > > > > wouldn't 'git diff master...my_branch' (note three dots instead of > > two) give what you want (or maybe its the other way round) ? > > > > regards, > > Aneesh > > > > -- > > 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-...@googlegroups.com<javascript:>. > > > To unsubscribe from this group, send email to > git-users+...@googlegroups.com <javascript:>. > > 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 view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/T5wqM1MIQOkJ. 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.
