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

2 votes129 views2 answers
How to assign an ad group to a folder mac os terminal
Shell/Bash
0 vote137 views1 answer
Git autocorrect
Shell/Bash
0 vote140 views1 answer
Diff files in different repositories
Shell/Bash
0 vote133 views1 answer
How to run program startup linus
Shell/Bash
0 vote129 views1 answer
Ubuntu passwordless sudo
Shell/Bash
0 vote118 views1 answer
Git make new branch from current
Shell/Bash
0 vote158 views1 answer
Command to update vlc in ubuntu
Shell/Bash
0 vote132 views1 answer
How to scan image in ubuntu 20.0
Shell/Bash
1 vote206 views2 answers
How to remove a vm in proxmox from terminal
Shell/Bash
0 vote131 views1 answer
How to chck if i have bluetooth in lunux machine
Shell/Bash