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 vote193 views1 answer
Axiox install
Shell/Bash
34 votes204 views4 answers
Sudo pip3 install
Shell/Bash
7 votes213 views2 answers
How to reverse a git pull
Shell/Bash
0 vote201 views1 answer
Conda install paraview
Shell/Bash
33 votes199 views3 answers
Installing Snap Store
Shell/Bash
1 vote191 views2 answers
Etherum for ubuntu
Shell/Bash
-1 vote219 views1 answer
Install netflix on ubuntu
Shell/Bash
0 vote200 views1 answer
Batch malware
Shell/Bash
10 votes219 views2 answers
How to install mongoose globally
Shell/Bash
0 vote232 views1 answer
Trash folder lonux
Shell/Bash