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

4 votes197 views2 answers
Bash how to log in to remote server
Shell/Bash
9 votes201 views1 answer
Delete conda from machine
Shell/Bash
2 votes197 views2 answers
Remove pods from xcode project terminal
Shell/Bash
0 vote202 views1 answer
For loop while loop shell functions
Shell/Bash
2 votes202 views2 answers
Crontab use nano
Shell/Bash
3 votes199 views7 answers
Pm2 install
Shell/Bash
1 vote179 views1 answer
Install InfluxDB Raspberry Pi
Shell/Bash
1 vote232 views1 answer
Bash print fields that begin with string
Shell/Bash
21 votes198 views5 answers
Bash get current path
Shell/Bash
0 vote220 views1 answer
Revolution of the daleks download
Shell/Bash