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 vote371 views1 answer
Os environ select defaut gpu
Shell/Bash
5 votes343 views1 answer
Bcryptjs
Shell/Bash
0 vote320 views1 answer
Vscode "code ." shortcut for Mac
Shell/Bash
17 votes364 views4 answers
Remove all volume docker
Shell/Bash
0 vote362 views1 answer
Netcat find all devices
Shell/Bash
9 votes365 views5 answers
Flutter build appbundle
Shell/Bash
0 vote377 views2 answers
How to update pytorch version
Shell/Bash
0 vote315 views1 answer
Wait-on yarn
Shell/Bash
59 votes370 views2 answers
Clone from a specific branch
Shell/Bash
1 vote363 views1 answer
Brew install eb cli
Shell/Bash