[plt-dev] Look before you leap

From: Eli Barzilay (eli at barzilay.org)
Date: Fri May 21 14:54:27 EDT 2010

On May 21, John Clements wrote:
> I recall liking your "executive^2" summary:
>  * Setup: git config --global alias.up "pull --ff-only --stat --all"
>  * Update before pushing with: git up
>  * When it tells you that it failed, use: git rebase origin
>    -- or if you have more substantial work: git merge origin
>  * Push out as usual: git push
> The only thing that's missing from this is:
> * Commit: git commit .

Yes, that was just a summary of how to do an update, so it's all

          ((lambda (x) (x x)) (lambda (x) (x x)))          Eli Barzilay:
                    http://barzilay.org/                   Maze is Life!

Posted on the dev mailing list.