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 vote223 views1 answer
Unzip all zip files in a proper directory
Shell/Bash
0 vote205 views1 answer
ModuleNotFoundError: No module named 'tensorflow_hub'
Shell/Bash
1 vote210 views2 answers
How to install cassandra
Shell/Bash
0 vote214 views1 answer
Linux wsl on window space used
Shell/Bash
0 vote241 views1 answer
Wireshark.msi install powershell
Shell/Bash
2 votes185 views2 answers
Javascript currencey formatter
Shell/Bash
0 vote188 views1 answer
Git diff meld
Shell/Bash
0 vote203 views1 answer
Grep for substring
Shell/Bash
0 vote188 views1 answer
From win32event import CreateEvent, MsgWaitForMultipleObjects ModuleNotFoundError: No module named 'win32event'
Shell/Bash
2 votes177 views1 answer
Bash wait 3 seconda
Shell/Bash