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 vote329 views1 answer
Git change author of last 2 commits
Shell/Bash
0 vote324 views1 answer
Ubuntu restricted extras
Shell/Bash
0 vote343 views1 answer
Enable MySQL as a service FreeBSD
Shell/Bash
1 vote328 views2 answers
Bash tokenize string
Shell/Bash
4 votes341 views1 answer
Ubuntu click problem after computer standby
Shell/Bash
0 vote325 views1 answer
Ssh find function
Shell/Bash
1 vote324 views5 answers
Linux set multiline variable
Shell/Bash
1 vote354 views1 answer
Reset bashrc
Shell/Bash
20 votes337 views1 answer
Add material
Shell/Bash
0 vote302 views1 answer
TSC_DEADLINE disabled due to Errata; please update microcode to version: 0x22
Shell/Bash