Larry D'AnnaSo say you have a project with a bunch of branches. You have two main computers you work on: a laptop and a workstation, and you keep an authoritative copy on a server somewhere. When you sit down at your laptop to work on your project, the first thing you want to do is make sure that whatever you've got locally is up-to-date with the repo on the server. So you run:
git push origin :
Then if it says anything isn't a fast-forward, you use some combination of git pull, git checkout, or git fetch to get all you branches up to date, then possibly you run the push again to push merges back to the server.
How about instead we add a new command called "git sync" that does all that for you? So if you say
git sync origin :
It matches refs just like git-push would, but it will also automatically fast-forward your local refs if possible. (and update the worktree+index if HEAD is one of the local refs that gets fast forwarded). If any merges would be required, it will print a warning and leave that ref alone.
And if you say
git sync --merge origin :
it will try to merge any refs that need it. If the merge succeeds, it will be exactly as if you had said
git checkout foobranch git pull origin foobranch git push origin foobranch
What do you all think? If you like the idea, I'll do it as a builtin. Otherwise I'll just hack up a perl script for myself.
--larry
