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

1 vote231 views1 answer
Ubuntu list files
Shell/Bash
1 vote230 views3 answers
Install gcc in ubuntu
Shell/Bash
0 vote243 views1 answer
Istio setup ssl
Shell/Bash
0 vote231 views1 answer
Command get full history terminal mac
Shell/Bash
0 vote230 views1 answer
Separate a file by pattern
Shell/Bash
2 votes328 views1 answer
Install brave on linux using snap
Shell/Bash
10 votes247 views2 answers
Install expo cli windows
Shell/Bash
2 votes241 views2 answers
How to set gopath/bin linux
Shell/Bash
0 vote234 views1 answer
Simple tutorial coding
Shell/Bash
1 vote237 views1 answer
Gatsby.ps1 is not digitally signed
Shell/Bash