What are some of your favorite settings in Git configuration files to make Git Fun?

configuration, git, version-control

Solution

The aliases I mention in Trimming GIT Checkins (and the `fixup!` action from the recent Git1.7.0):

[alias]
    fixup = !sh -c 'git commit -m \"fixup! $(git log -1 --format='\\''%s'\\'' $@)\"' -
    squash = !sh -c 'git commit -m \"squash! $(git log -1 --format='\\''%s'\\'' $@)\"' 

, really help me to commit very often even though I am in the middle of one task, allowing me to finish it with one coherent commit at the end (instead of too many small intermediate commits). Not exactly "fun", but very useful.

Problem

What are your favorite Git configuration settings which make your life easy while working with Git?

Original source

Related problems