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 vote129 views1 answer
Github tips
Shell/Bash
0 vote144 views1 answer
How to deploy project on github
Shell/Bash
0 vote133 views1 answer
How to make xcopy create destination dirs if they don't exist
Shell/Bash
0 vote131 views1 answer
Download clamav ubuntu 20
Shell/Bash
0 vote108 views1 answer
How to upen image in kali linux
Shell/Bash
6 votes126 views1 answer
Checking globally installed packages
Shell/Bash
4 votes95 views2 answers
Echo multiple lines to file
Shell/Bash
8 votes166 views1 answer
Run requirements.txt conda
Shell/Bash
0 vote135 views1 answer
How to open ssh on port 22 manjaro
Shell/Bash
0 vote141 views1 answer
Linux install with package manager snap snapd
Shell/Bash