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 vote262 views1 answer
Cpanel format new drive and mount for backup
Shell/Bash
5 votes284 views4 answers
Function in bash
Shell/Bash
0 vote272 views1 answer
Run exe in proton prefix
Shell/Bash
0 vote290 views1 answer
Linux invalid filename fix
Shell/Bash
0 vote255 views1 answer
Install wmctrl in mac
Shell/Bash
5 votes275 views1 answer
Get list of all branches github
Shell/Bash
0 vote275 views1 answer
Move view vim
Shell/Bash
1 vote262 views1 answer
Github show files changed git log
Shell/Bash
1 vote283 views1 answer
Install dirsearch
Shell/Bash
1 vote259 views1 answer
Install php zip extension ubuntu
Shell/Bash