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 vote112 views2 answers
How to install kite on manjero
Shell/Bash
1 vote114 views2 answers
Execute program in background bash
Shell/Bash
2 votes159 views5 answers
Git change commit author
Shell/Bash
0 vote114 views1 answer
Valgrind memory leak
Shell/Bash
56 votes125 views6 answers
Remove git from folder
Shell/Bash
0 vote114 views1 answer
How to install tar.gz setup of pycharm community
Shell/Bash
0 vote119 views4 answers
How to empty a file in linux
Shell/Bash
72 votes149 views6 answers
Install docker ubuntu 20.04
Shell/Bash
9 votes128 views6 answers
Merge master into branch
Shell/Bash
25 votes117 views3 answers
Jupyter command install
Shell/Bash