My favourite command, 'git up': (save as git-up somewhere in your PATH):

#!/bin/sh

no_changes () { git diff-index --quiet --cached HEAD --ignore-submodules -- && git diff-files --quiet --ignore-submodules }

git update-index -q --refresh POP=1 if no_changes ; then POP=0 else echo "Saving local modifications" git stash POP=1 fi

echo "" echo "Updating from remote server" if git pull --rebase "$@" ; then echo "" git log --stat HEAD@{1}..HEAD@{0} echo "" fi

if [ $POP = 1 ] ; then echo "" echo "Restoring stashed local modifications" git stash pop fi

Doesn't it?

Aha, another one of those odd cvs-isms I've almost forgotten by now. It's better to relearn, I'd say.

Not really, because deleting a file is also a change (unless it was freshly added, of course). It's one of those cases where cvs has fostered broken thinking which one gets used to after a while.

"git checkout -- <file>" does exactly the right thing, because typically one doesn't want to pull in the latest version from the server at the same time. The only thing git doesn't get quite right here imo is that it isn't available from git reset; "git reset --hard -- <file>" would have been more logical.

Well, I like to separate updating and discarding changes, but sure, it's a personal preference. In the second case though, when the mess is the result of an update, one already got the latest version, and then it's much quicker to skip the fetch.

My favourite config variable:

git config --global core.pager cat