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 vote147 views1 answer
Git clone same name
Shell/Bash
1 vote153 views1 answer
Brew install gcloud
Shell/Bash
0 vote146 views1 answer
Awk split each character
Shell/Bash
3 votes155 views2 answers
Linux date command live update
Shell/Bash
0 vote150 views2 answers
Conda install numba
Shell/Bash
2 votes181 views1 answer
'json-server' is not recognized as an internal or external command, operable program or batch file.
Shell/Bash
0 vote150 views1 answer
Check number of threads in a process linux
Shell/Bash
66 votes183 views6 answers
Git revert to last commit
Shell/Bash
0 vote134 views1 answer
Check version of heroku cli
Shell/Bash
0 vote141 views1 answer
Yaml file example ubuntu netplan error
Shell/Bash