SHELL

git diff between one file

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

git diff
#show all changes

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>

git diff of a file

git diff file-name

#you can also add an alias on Mac
alias gd="git diff"
alias add_alias="code ~/.zshrc" #open the file in vscode

git diff

# This will show the changes you just pulled
git diff 43v535..cbb745