index 402ff3782c0aaa472a2013ff3a9bef44a6cd8550..c2bedd622c7238359ab88592857bb50eeaa568f8 100755 (executable)
warn
warn " git commit --amend"
warn
+ warn "Once you are satisfied with your changes, run"
+ warn
+ warn " git rebase --continue"
+ warn
exit 0
;;
squash|s)
shift ;;
esac
;;
- --merge)
+ -m|--merge)
# we use merge anyway
;;
-C*)