Git update: the odyssey for a sensible Git pull – Felipe Contreras

See also the author's fork of git which supports the `git update` command: https://github.com/felipec/git