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

1 vote230 views1 answer
Powreshell function cleanup
Shell/Bash
3 votes242 views1 answer
Ubuntu install sfml
Shell/Bash
6 votes238 views4 answers
Python pytorch
Shell/Bash
11 votes228 views1 answer
React-native init directory locked in ubuntu why
Shell/Bash
6 votes255 views2 answers
Conda install version
Shell/Bash
0 vote221 views1 answer
Redux toolkit template
Shell/Bash
0 vote289 views1 answer
How many megabytes is a Mbit?
Shell/Bash
1 vote245 views1 answer
How to remove cisco umbrella
Shell/Bash
0 vote206 views1 answer
Unable to correct problems, you have held broken packages installing cuda
Shell/Bash
0 vote229 views1 answer
Scp local to ssh aws
Shell/Bash