$ git checkout master
$ git difftool -t kdiff3 local-branch HEAD

git merge --no-commit --no-ff <local-branch>

git commit -a

git diff --name-only <branch1> <branch2>
git checkout <branch1> -- <paths>

git checkout master
git log --reverse --oneline topic ^master

git rebase master topic