I wrapped every git command except the one that mattered.

Also, don't run our post-merge magic every time --
only run it if this is the real, user-approved merge
run as 'gitpuppet'.

Change-Id: I4283663c5089f42967131472fd9bbd7602773a69
Merge "I wrapped every git command except the one that mattered." into production