Comment by merloen

I have a cronjob that does a "git fetch" every 5 minutes. That means I never pull. I merge-fastforward, and I rebase. Very satisfied with that workflow.