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 vote345 views1 answer
Script delete files older than
Shell/Bash
0 vote351 views1 answer
Grep lines between two patterns in unix
Shell/Bash
0 vote329 views1 answer
Repo tool depth
Shell/Bash
0 vote348 views1 answer
Installing Dradis
Shell/Bash
0 vote333 views1 answer
Check container logging driver
Shell/Bash
0 vote336 views1 answer
AppRegistryNotReady notebook django shell
Shell/Bash
0 vote323 views1 answer
Sftp list local directory
Shell/Bash
0 vote345 views1 answer
Nginx file permission
Shell/Bash
1 vote339 views1 answer
How to isntall blender on linux
Shell/Bash
0 vote324 views1 answer
Linkar repo en github
Shell/Bash