Make 'git wip' do a "merge" when HEAD is newer and there are not changes