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 vote172 views1 answer
Linux "Error: Timeout was reached"
Shell/Bash
10 votes186 views4 answers
Git revert uncommitted changes
Shell/Bash
0 vote204 views1 answer
Set up vm arch
Shell/Bash
-1 vote248 views1 answer
Fortios download linux
Shell/Bash
7 votes171 views3 answers
Tsc init
Shell/Bash
0 vote174 views1 answer
Nohup redirect output
Shell/Bash
0 vote222 views1 answer
Install solidity compiler ubuntu
Shell/Bash
20 votes193 views3 answers
Git clone with folder name
Shell/Bash
3 votes217 views5 answers
How to install nodejs on manjaro
Shell/Bash
1 vote179 views2 answers
How to check installed packages in linux command
Shell/Bash