index 76dc679e62cf32a5ba04902558812e3244baf936..6d140928890fccc0b2ac8fd640a236ffbad21793 100755 (executable)
USAGE='(--continue | --abort | --skip | [--preserve-merges] [--verbose]
[--onto <branch>] <upstream> [<branch>])'
USAGE='(--continue | --abort | --skip | [--preserve-merges] [--verbose]
[--onto <branch>] <upstream> [<branch>])'
+OPTIONS_SPEC=
. git-sh-setup
require_work_tree
. git-sh-setup
require_work_tree