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

1 vote160 views1 answer
Fatal: unable to auto-detect email address (got 'root@LaptopName.(none)')
Shell/Bash
28 votes177 views4 answers
List all users linux
Shell/Bash
9 votes181 views3 answers
Git add commit in one command
Shell/Bash
11 votes170 views4 answers
Start mongodb
Shell/Bash
2 votes167 views5 answers
Sed replace single line with multi line
Shell/Bash
0 vote157 views1 answer
Terminal find containing directory of file and cd to directory
Shell/Bash
0 vote203 views2 answers
Install leafpad ubuntu 2021
Shell/Bash
0 vote172 views1 answer
How to ignore folder in gitignore duplicate
Shell/Bash
1 vote166 views1 answer
Error: Fehler beim Versenden einiger Referenzen nach 'git@git
Shell/Bash
0 vote179 views2 answers
Ispconfig auto installer
Shell/Bash