How to see the changes between two commits without commits in-between

Question

How do you make git diff only show the difference between two commits  excluding the other commits in-between

User · Answer

git log commit-1 new latest recent commit  commit-2 commit-3 commit-4     commit-n first commit    git diff commit-2   commit-1  display s all changes between commit-2 to commit-1  patch of commit-1 alone  amp  equivalent to git diff HEAD 1 HEAD   similarly  git diff commit-4   commit-1  display s all changes between commit-4 to commit-1  patch of commit-1  commit-2  amp  commit-3 together  Equivalent to git diff HEAD 3 HEAD    git diff commit-1   commit-2  By changing order commit ID s it is possible to get revert patch     quot  git diff commit-1 commit-2  gt  revert patch of commit-1 diff quot

User · Answer

Asking for the difference  between  two commits without including the commits in-between makes little sense  Commits are just snapshots of the contents of the repository  asking for the difference between two necessarily includes them  So the question then is  what are you really looking for   As William suggested  cherry-picking can give you the delta of a single commit rebased on top of another  That is     git checkout 012345   git cherry-pick -n abcdef   git diff --cached   This takes commit  abcdef   compares it to its immediate ancestor  then applies that difference on top of  012345   This new difference is then shown - the only change is the context comes from  012345  rather than  abcdef s immediate ancestor  Of course  you may get conflicts and etc  so it s not a very useful process in most cases   If you re just interested in abcdef itself  you can do     git log -u -1 abcdef   This compares abcdef to its immediate ancestor  alone  and is usually what you want   And of course    git diff 012345  abcdef   gives you all differences between those two commits   It would help to get a better idea of what you re trying to achieve - as I mentioned  asking for the difference between two commits without what s in between doesn t actually make sense

User · Answer

git diff  lt a-commit gt   lt another-commit gt  path   Example   git diff commit1 commit2 config routes rb   It shows the difference on that file between those commits

User · Answer

Since Git 2 19  you can simply use   git range-diff rev1   rev2 - compare two commit trees  starting by their common ancestor  or git range-diff rev1   rev1 rev2   rev2 - compare of changes introduced by 2 given commits

User · Answer

For checking complete changes     git diff  lt commit Id 1 gt   lt commit Id 2 gt    For checking only the changed added deleted files     git diff  lt commit Id 1 gt   lt commit Id 2 gt  --name-only   NOTE  For checking diff without commit in between  you don t need to put the commit ids

User · Answer

What about this   git diff abcdef 123456   less   It s handy to just pipe it to less if you want to compare many different diffs on the fly

User · Answer

Let me introduce easy GUI idiot proof approach that you can take in these situations   Clone another copy of your repo to new folder  for example myRepo temp Checkout the commit branch that you would like to compare with commit in your original repo  myRepo original   Now you can use diff tools   like Beyond Compare etc   with these two folders  myRepo temp and myRepo original   This is useful for example if you want partially reverse some changes as you can copy stuff from one to another folder

User · Answer

To compare two git commits 12345 and abcdef as patches one can use the diff command as  diff  lt  git show 123456   lt  git show abcdef

User · Answer

My alias settings in    zshrc file for git diff   alias gdf  git diff HEAD          diff between your recent tow commits   Thanks   Jinmiao Luo    git diff HEAD 2 HEAD  complete change between latest 2nd commit and current   HEAD is convenient

User · Answer

you can simply pass the 2 commits to git diff like    - gt  git diff 0da94be  59ff30c  gt  my patch - gt  git apply my patch

User · Answer

My alias settings in    bashrc file for git diff   alias gdca  git diff --cached    diff between your staged file and the last commit alias gdcc  git diff HEAD        diff between your latest two commits

User · Answer

Suppose you want to see the difference between commits 012345 and abcdef   The following should do what you want      git checkout 012345   git cherry-pick -n abcdef   git diff --cached

User · Answer

I wrote a script which displays diff between two commits  works well on Ubuntu   https   gist github com jacobabrahamb4 a60624d6274ece7a0bd2d141b53407bc     usr bin env python import sys  subprocess  os  TOOLS     bcompare    meld    def getTool        for tool in TOOLS          try              out   subprocess check output   which   tool   strip               if tool in out                  return tool         except subprocess CalledProcessError              pass     return None  def printUsageAndExit        print  Usage  python bdiff py  lt project gt   lt commit one gt   lt commit two gt       print  Example  python bdiff py  lt project gt  0 1      print  Example  python bdiff py  lt project gt  fhejk7fe d78ewg9we      print  Example  python bdiff py  lt project gt  0 d78ewg9we      sys exit 0   def getCommitIds name  first  second       commit1   None     commit2   None     try          first index   int first  - 1         second index   int second  - 1         if int first   lt  0 or int second   lt  0              print  Cannot handle negative values                sys exit 0          logs   subprocess check output   git    -C   name   log    --oneline    --reverse    split   n           if first index  gt   0              commit1   logs first index  split      0          if second index  gt   0              commit2   logs second index  split      0      except ValueError          if first     0               commit1   first         if second     0               commit2   second     return commit1  commit2  def validateCommitIds name  commit1  commit2       if commit1    None and commit2    None          print  Nothing to do  exit           return False     try          if commit1    None              subprocess check output   git    -C   name   cat-file    -t   commit1   strip           if commit2    None              subprocess check output   git    -C   name   cat-file    -t   commit2   strip       except subprocess CalledProcessError          return False     return True  def cleanup commit1  commit2           subprocess check output   rm    -rf     tmp    commit1 if commit1    None else  0      tmp    commit2 if commit2    None else  0      def checkoutCommit name  commit       if commit    None          subprocess check output   git    clone   name    tmp   commit           subprocess check output   git    -C     tmp   commit   checkout   commit       else          subprocess check output   mkdir     tmp 0     def compare tool  commit1  commit2           subprocess check output  tool    tmp    commit1 if commit1    None else  0      tmp    commit2 if commit2    None else  0      if   name       main         tool   getTool       if tool    None          print  No GUI diff tools          sys exit 0      if len sys argv     4          printUsageAndExit        name  first  second   None  0  0     try          name  first  second   sys argv 1   sys argv 2   sys argv 3      except IndexError          printUsageAndExit        commit1  commit2   getCommitIds name  first  second       if not validateCommitIds name  commit1  commit2           sys exit 0       cleanup commit1  commit2      checkoutCommit name  commit1      checkoutCommit name  commit2       try          compare tool  commit1  commit2      except KeyboardInterrupt          pass     finally          cleanup commit1  commit2      sys exit 0

User · Answer

Let s say you have this  A   B    A0        C    D                  And you want to make sure that A is the same as A0    This will do the trick     git diff B A  gt  B-A diff   git diff D A0  gt  D-A0 diff   diff B-A diff D-A0 diff

[git] How to see the changes between two commits without commits in-between?

Examples related to git

Examples related to diff