Stack Overflow
Stack Overflow

Questions tagged [git-diff]

Shows changes between the working tree and the committed contents of a git repository, or between two commits or branches of the repository.

git-diff(1) shows changes between the working tree and the committed contents of a git repository, or between two commits or branches of the repository.

It has a number of options to control which versions to diff and also how the produced diff output is formatted, see the man-page for details.

1085 questions
-2
votes
1 answer

git merge differences using ".." instead of "..."

I have a master and a dev branch. When I compare the two branches using git diff master...dev, there are no differences between them. However, when I use git diff master..dev, there are some files present in dev which are not present in master. I'd…
kyc12
  • 349
  • 2
  • 15
-2
votes
1 answer

Changes between two commits in git

I have hashes of two commits in a Git repository and I want to get the list of differences between those two commits. The git log command returns all commits between them but not the differences: git log commit1 commit2
Subit Das
  • 509
  • 3
  • 6
  • 14
-2
votes
1 answer

git config - double diff and merge tool

I checked my git settings today and I found that I have 2 different diff and mergetools there. Is this normal?
cd491415
  • 823
  • 2
  • 14
  • 33
-2
votes
2 answers

Check for uncommitted changes in another branch x, without checking out branch x

I want to determine if another branch has uncommitted changes, but I don't want to check that branch out. Basically I want to find out if another branch has a "dirty index". This means either staged or unstaged changes that are uncommitted. Is this…
user5047085
-5
votes
2 answers

Why does output differ under git diff vs. git diff --staged?

Why do we need both of these? And in what circumstances does the output they give on the command line differ? Can you explain the differences between the two under different scenarios like adding files, staging, and modifying. So what are the staged…
kanayt
  • 157
  • 1
  • 3
  • 10
1 2 3
…
72
73