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

2 votes211 views3 answers
Git push to another repository
Shell/Bash
0 vote181 views1 answer
Ubuntu change night light intensity
Shell/Bash
112 votes210 views6 answers
Install angular cli
Shell/Bash
0 vote186 views1 answer
Mover archivos de local a ssh
Shell/Bash
0 vote188 views1 answer
Jq delete variable
Shell/Bash
1 vote195 views1 answer
Address already in use flask ubuntu
Shell/Bash
1 vote205 views1 answer
'sanity' is not recognized as an internal or external command
Shell/Bash
2 votes183 views5 answers
Nuxt install
Shell/Bash
3 votes287 views1 answer
Run laravel lumen server
Shell/Bash
0 vote213 views2 answers
No such file as readline.h
Shell/Bash