git: add merge-old-head alias

Signed-off-by: Christopher Larson <kergoth@gmail.com>