Just a note to self on how to do git rebase (in this case, to get new changes to master into current working branch) without gui…
// Start
git fetch origin
git rebase origin/master
// Continue after conflicts fixed
git rebase --continue
// Abort if giving up
git rebase --abort
git fetch origin
git rebase origin/master
// Continue after conflicts fixed
git rebase --continue
// Abort if giving up
git rebase --abort