On Thu, Dec 13, 2012 at 4:58 AM, Oliver Kiddle <okiddle@yahoo.co.uk> wrote:

> +* Before pushing your changes to the main zsh repository, you can use
> +  "git pull --rebase" to fetch any new updates from the server and
> +  rebase your changes on top of them.


It's nice to create an alias for this to make it less likely that someone
pulls and creates a merge commit.  I like this:

  git config --global alias.up 'pull --rebase --stat'

That lets you just say "git up" to update to the latest code, rebasing any
of your local changes.  It also comments on what files were changed (the
--stat part), which I also like.

Someone might also be interested in my scm helper aliases if you find
yourself changing between several type of scm:  http://opencoder.net/repos/

..wayne..