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 vote271 views1 answer
Docker wordpress plugins permissions
Shell/Bash
1 vote282 views1 answer
Gitkraken snap
Shell/Bash
0 vote281 views1 answer
Does git bash have bashrc
Shell/Bash
1 vote298 views2 answers
How to cd into local machine using ubuntu subsystem
Shell/Bash
12 votes313 views2 answers
Linux memory cache clear
Shell/Bash
0 vote290 views1 answer
Ssh no strict checking
Shell/Bash
7 votes314 views4 answers
Vuex install
Shell/Bash
0 vote354 views1 answer
Wget a file from bitbucket
Shell/Bash
4 votes269 views1 answer
Chocolatey list installed
Shell/Bash
-1 vote294 views1 answer
McFly: Upgrading McFly DB to version 3, please wait...thread 'main' panicked at 'McFly error: Unable to add cmd_tpl to commands (duplicate column name: cmd_tpl)', src/history/schema.rs:41:17
Shell/Bash