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 vote325 views2 answers
Install kazam ubuntu 18.04
Shell/Bash
2 votes314 views2 answers
Adb screen record
Shell/Bash
0 vote332 views1 answer
Git bash terminal weird characters
Shell/Bash
-1 vote277 views9 answers
Unzip a zip file ubuntu
Shell/Bash
0 vote298 views1 answer
Cocoapods not found in android studio but flutter run works
Shell/Bash
4 votes317 views1 answer
Get cpu frequency linux
Shell/Bash
0 vote296 views1 answer
Git get latest
Shell/Bash
0 vote303 views1 answer
Git check version of branch
Shell/Bash
3 votes347 views2 answers
Cat ssh key
Shell/Bash
0 vote327 views1 answer
How to know status psql in linux
Shell/Bash