git commit --amend -m "New commit message" && git pull git rebase -i HEAD^[number] e: edit p: pick s: merge