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

0 vote299 views1 answer
Command line move file
Shell/Bash
11 votes283 views5 answers
Pm2 run
Shell/Bash
1 vote290 views2 answers
Chmod: Unable to change file mode Operation not permitted
Shell/Bash
1 vote311 views1 answer
The windows subsystem for linux component is not enabled
Shell/Bash
1 vote304 views1 answer
Scp folder recursive
Shell/Bash
0 vote284 views1 answer
How to open file explorer with sudo ubuntu
Shell/Bash
0 vote293 views1 answer
How to install rfkill in kali linux
Shell/Bash
0 vote290 views1 answer
Subl command not found
Shell/Bash
3 votes298 views1 answer
Bash for-schleife 1 bis 10
Shell/Bash
0 vote312 views1 answer
Ubuntu fractional scaling
Shell/Bash