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 vote345 views1 answer
Pod install react native failed
Shell/Bash
5 votes327 views2 answers
Failed to launch the browser process puppeteer
Shell/Bash
0 vote376 views1 answer
Create a tunnel via permanently
Shell/Bash
1 vote456 views1 answer
Sudo apt install net tools
Shell/Bash
0 vote326 views1 answer
Join 2 files linux
Shell/Bash
0 vote333 views2 answers
Install mariadb ubuntu linixize
Shell/Bash
0 vote388 views1 answer
Po to mo ubuntu
Shell/Bash
7 votes390 views2 answers
Create next app with typscript
Shell/Bash
0 vote375 views1 answer
Node execute local bin
Shell/Bash
0 vote341 views1 answer
Open wsl as root
Shell/Bash