Merging Zettelkastens with Git

Download any committed changes from upstream and stack our new notes atop those:

git fetch
git rebase origin/master

Push changes to a branch upstream (gets around problem where its usually checked out on the desktop):

git push origin master:incoming-(hostname)

then go to the other machine and merge the branch back to master.

• Creating remote branches with Git (stack overflow)