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 vote171 views1 answer
Allow a port in centos 8 stackoverflow
Shell/Bash
2 votes219 views1 answer
Change unix line separator to dos
Shell/Bash
2 votes165 views2 answers
Get diff stash
Shell/Bash
0 vote165 views1 answer
You need to install postgresql-server-dev-X.Y for building a server-side extension or libpq-dev for building a client-side application.
Shell/Bash
1 vote169 views1 answer
Abort cherry pick in bash
Shell/Bash
0 vote181 views2 answers
Instalar webmin ubuntu 20.04
Shell/Bash
1 vote156 views4 answers
How to uninstall vscode in ubuntu
Shell/Bash
2 votes229 views1 answer
Ubuntu delete all files with extension
Shell/Bash
0 vote232 views4 answers
Cleaning up your ubuntu system
Shell/Bash
0 vote186 views1 answer
Tools for debuging a server
Shell/Bash