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

7 votes212 views2 answers
Whatapp
Shell/Bash
1 vote186 views1 answer
Dyld: lazy symbol binding failed: Symbol not found: _ffi_prep_closure_loc
Shell/Bash
0 vote222 views2 answers
Pyinstaller Failed to execute script pyi_rth__tkinter
Shell/Bash
0 vote173 views1 answer
Linux kill other user xorg
Shell/Bash
3 votes197 views1 answer
Vscode restart window
Shell/Bash
3 votes172 views3 answers
[!] Android Studio (version 4.1.0) X Flutter plugin not installed; this adds Flutter specific functionality. X Dart plugin not installed; this adds Dart specific functionality.
Shell/Bash
21 votes230 views6 answers
Restart nginx mac
Shell/Bash
0 vote217 views1 answer
Login as root debian
Shell/Bash
0 vote166 views1 answer
Sshkeygen validate keys
Shell/Bash
8 votes193 views4 answers
Undo git rebase
Shell/Bash