Thanks, but gitfs looks too automated (I want more control), and in any case my git workflow is super-convenient with magit.
Things are working out smoothly at the moment. In case someone is interested, this is how I do it:
- set up a private repo on Gitlab, ssh keys and smooth access to the repo on both machines.
- prepare a pilot run on the laptop on a git branch, push to the repo.
- pull the branch from the server. if it works out, merge to
master, otherwise
a. for minor tweaks, edit remotely via tramp,
b. for larger changes, work on the laptop and push/pull again.
Long runs courtesy of tmux.