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 vote107 views1 answer
Virtualbox ubuntu mouse scroll not working
Shell/Bash
0 vote167 views1 answer
Install turtle command
Shell/Bash
3 votes109 views2 answers
Git not using ssh key
Shell/Bash
0 vote119 views1 answer
ModuleNotFoundError: No module named 'localflavor'
Shell/Bash
185 votes282 views6 answers
Nodemon install
Shell/Bash
1 vote109 views1 answer
Chmod read only command in linux
Shell/Bash
0 vote115 views1 answer
Gitlab add remote upstream
Shell/Bash
0 vote108 views1 answer
Install jake
Shell/Bash
2 votes108 views2 answers
How i can install composer after download froject from githb
Shell/Bash
0 vote123 views1 answer
Linux settings not opening
Shell/Bash