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 vote166 views1 answer
How to enable or disable test mode on windows 10
Shell/Bash
1 vote148 views1 answer
How to find jvm path in linux
Shell/Bash
1 vote188 views1 answer
Jupyter sagemath kernel
Shell/Bash
0 vote154 views1 answer
Macos homebrew unattended cask installs
Shell/Bash
0 vote153 views1 answer
Vcpkg install 64 bit
Shell/Bash
0 vote156 views1 answer
Man in linux
Shell/Bash
0 vote201 views1 answer
Install nasm ubuntu
Shell/Bash
0 vote175 views1 answer
Git go back to head after checkout commit
Shell/Bash
0 vote190 views1 answer
Replace char for new line
Shell/Bash
0 vote160 views1 answer
Bluez ubuntu 20.04
Shell/Bash