xigoi / gitconfig / 3b2c22d vs. de18c49

  ma = merge --abort
  mm = merge master
  p = push
  pf = push --force-with-lease
  pff = push --force
  po = push --set-upstream origin
  pom = push --set-upstream origin master
  r = remote