Git diff

Git diff two commits one file

$ git diff HEAD^^ HEAD main.c
$ # show diff between HEAD(current commit) and HEAD^^(two commits back) for main.c

Source: stackoverflow.com

Git diff of a file between two commits

git diff <branch_hash> <other_branch_hash> -- <file_path>

Git diff files only

Just specify your local branch1 or remote origin/branch2
git diff branch1 origin/branch2	#show diff referenced from second branch
git diff branch1 branch2 file.txt #show diff only between file.txt

Git diff

## View all the merge conflicts:
git diff

## View the conflicts against the base file:
git diff --base <filename>

## Preview changes, before merging:
git diff <sourcebranch> <targetbranch>

Similar codes

13 votes265 views6 answers
Revert last merge git
Shell/Bash
3 votes271 views2 answers
Npm WARN deprecated [email protected]: This version of tar is no longer supported, and will not receive security updates. Please upgrade asap.
Shell/Bash
0 vote284 views1 answer
Base64 decode in powershell
Shell/Bash
0 vote253 views1 answer
How to make a single digit date start with zero
Shell/Bash
0 vote277 views1 answer
Eks cluster command for own CNI deployment
Shell/Bash
0 vote267 views1 answer
Is it possible to check with my website if an app is installed?
Shell/Bash
0 vote238 views1 answer
Bitbucket tag
Shell/Bash
0 vote280 views1 answer
Rename all files in a folder with progressive numbers linux
Shell/Bash
0 vote241 views1 answer
Conda install keras gpu
Shell/Bash
2 votes745 views1 answer
'json-server' is not recognized as an internal or external command, operable program or batch file.
Shell/Bash