Updating git bare repo from origin (without losing changes)

Question

I'm setting up a git repo on my server for my work with contiki.

It should be accessible from multiple machines so I made a bare clone from the contiki repo, created a new branch and commited my changes.

Now I'm trying to update my repo with the new commits from the contiki repo and rebase my branch on them, but git tells me "pull" would only work in a work tree. "fetch" on the other hand just creates a new "FETCH_HEAD" file.

What do I do? Would a mirror-repo do the job? (But I don't want to publish my branch, just receive updates)

Answer 1

You need a working tree to do a pull in case it introduces conflicts you need to resolve. Just pull into any clone with a working tree, do what you need to do, then push to your bare clone.