git fetch --all
git reset --hard origin/mastergit ls-tree --name-only -r <commit-ish>git update-ref -d HEADgit diff --name-only --diff-filter=Ugit checkout master
git branch --mergedgit checkout -git branch -vvgit branch -u origin/mybranchgit fetch --all
git reset --hard origin/mastergit ls-tree --name-only -r <commit-ish>git update-ref -d HEADgit diff --name-only --diff-filter=Ugit checkout master
git branch --mergedgit checkout -git branch -vvgit branch -u origin/mybranch