git_commands.sh

# Show commits diffrence between two branches
git log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative branch-A..branch-B

# Create patch
git format-patch <branch-to-compare-with> --stdout > <filename>
git format-patch commitStart^..commitLatest --stdout > <filename>

# Apply patch
git apply --check <filename>
git am --signoff < <filename>

# List conflicted files after merge
git diff --name-only --diff-filter=U

# Undo merge
git reset --merge ORIG_HEAD

# View file history
git log -p <file>

# Add files to last commit
git commit --amend –C HEAD