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 vote123 views2 answers
How to convert openssl to keytool
Shell/Bash
1 vote132 views1 answer
Prittier download ubuntu
Shell/Bash
0 vote128 views1 answer
Dash plotly
Shell/Bash
1 vote124 views1 answer
Bash split string into variables
Shell/Bash
37 votes159 views5 answers
How to start nginx in ubuntu
Shell/Bash
0 vote135 views2 answers
Powershell merge multiple text files
Shell/Bash
0 vote132 views1 answer
Grep on mac os terminal
Shell/Bash
1 vote126 views1 answer
Install utorrent ubuntu terminal
Shell/Bash
0 vote134 views1 answer
Phenix applyncs
Shell/Bash
0 vote187 views1 answer
Close adb server
Shell/Bash