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 vote181 views1 answer
Gdebi
Shell/Bash
66 votes180 views6 answers
Extract tar.gz in linux
Shell/Bash
-1 vote185 views1 answer
Metasploit install kali linux
Shell/Bash
1 vote194 views1 answer
Gensim install
Shell/Bash
0 vote182 views1 answer
Bash expect not working in crontab
Shell/Bash
1 vote194 views1 answer
Speed up video with ffmpeg
Shell/Bash
0 vote205 views1 answer
Install latest golang on ubuntu
Shell/Bash
0 vote166 views1 answer
How to check firebase version
Shell/Bash
0 vote199 views1 answer
How to setup a command that install all npm modules, in subfolders
Shell/Bash
0 vote272 views1 answer
Install spectral pytohn
Shell/Bash