Change default of git-reup to be merge and change -m to -r for rebase option
Change default of git-reup to be merge and change -m to -r for rebase option

jeffbuttars/env,jeffbuttars/env,jeffbuttars/env