git checkout dmgr2 # gets you "on branch dmgr2"
git fetch origin # gets you up to date with origin
git merge origin/master
git reset --soft HEAD^
#or
git reset --soft HEAD~
git commit --amend -m "message"
git checkout dmgr2 # gets you "on branch dmgr2"
git fetch origin # gets you up to date with origin
git merge origin/master
git reset --soft HEAD^
#or
git reset --soft HEAD~
git commit --amend -m "message"