Git diff between current branch and master but not including unmerged master commits

Question

I want a diff of all changes in a branch that is not merged to master yet   I tried   git diff master git diff branch  master git diff branch   master   However  in each of these cases the diff contains content in master that has not been merged into my branch yet   Is there a way to do a diff between my branch and master that excludes changes in master that have not been merged into my branch yet

User · Answer

git diff  git merge-base master branch   branch  Merge base is the point where branch diverged from master  Git diff supports a special syntax for this  git diff master   branch  You must not swap the sides because then you would get the other branch  You want to know what changed in branch since it diverged from master  not the other way round  Loosely related   Finding a branch point with Git  How can I see what branch another branch was forked from    Note that    and     syntax does not have the same semantics as in other Git tools  It differs from the meaning specified in man gitrevisions  Quoting man git-diff    git diff  --options   lt commit gt   lt commit gt   --    lt path gt      This is to view the changes between two arbitrary  lt commit gt    git diff  --options   lt commit gt    lt commit gt   --    lt path gt      This is synonymous to the previous form  If  lt commit gt  on one side is omitted  it will have the same effect as using HEAD instead   git diff  --options   lt commit gt     lt commit gt   --    lt path gt      This form is to view the changes on the branch containing and up to the second  lt commit gt   starting at a common ancestor of both  lt commit gt    quot git diff A   B quot  is equivalent to  quot git diff   git-merge-base A B  B quot   You can omit any one of  lt commit gt   which has the same effect as using HEAD instead    Just in case you are doing something exotic  it should be noted that all of the  lt commit gt  in the above description  except in the last two forms that use  quot    quot  notations  can be any  lt tree gt   For a more complete list of ways to spell  lt commit gt   see  quot SPECIFYING REVISIONS quot  section in gitrevisions 7   However   quot diff quot  is about comparing two endpoints  not ranges  and the range notations   quot  lt commit gt    lt commit gt  quot  and  quot  lt commit gt     lt commit gt  quot   do not mean a range as defined in the  quot SPECIFYING RANGES quot  section in gitrevisions 7

User · Answer

According to Documentation  git diff Shows changes between the working tree and the index or a tree  changes between the index and a tree  changes between two trees  changes resulting from a merge  changes between two blob objects  or changes between two files on disk   In git diff - There s a significant difference between two dots    and 3 dots     in the way we compare branches or pull requests in our repository  I ll give you an easy example which demonstrates it easily  Example  Let s assume we re checking out new branch from master and pushing some code in    G---H---I feature  Branch     A---B---C---D master  Branch    Two dots - If we want to show the diffs between all changes happened in the current time on both sides  We would use the git diff origin master  feature or just git diff origin master  output    H  I against A  B  C  D    Three dots - If we want to show the diffs between the last common ancestor  A   aka the check point we started our new branch  we use git diff origin master   feature output   H  I against A     I d rather use the 3 dots in most circumstances

User · Answer

As also noted by John Szakmeister and VasiliNovikov  the shortest command to get the full diff from master s perspective on your branch is   git diff master      This uses your local copy of master   To compare a specific file use   git diff master    filepath   Output example

User · Answer

Here s what worked for me   git diff origin master      This shows only the changes between my currently selected local branch and the remote master branch  and ignores all changes in my local branch that came from merge commits

[git] Git diff between current branch and master but not including unmerged master commits

Examples related to git

Examples related to version-control

Examples related to merge

Examples related to diff

Examples related to git-diff