Git

Alias

New alias:

git config --global alias.co checkout

Useful definitions:

alias.moddiff diff --diff-filter=M
alias.unstage reset HEAD --
alias.alias !git --no-pager config --get-regexp alias
alias.revfile checkout HEAD --
alias.info !gitinfo
alias.pullign pull -Xignore-space-change

Merge manually

Source

Hybrid — best of both worlds

Prerequisite: Configure git to use a modern diff tool like kdiff3 by setting diff.tool and merge.tool.
A method that combines merging and diffing would look something like this:

git merge --no-commit --no-ff other_branch
git mergetool
git difftool HEAD
git commit