Add git aliases for rebase/merge from remotes

As I'm not using "git pull", but instead fetching then rebasing/merging
(context-dependent), these shorthands simplify the task of
incorporating changes downstream.