The usage message was confusing as it implied that interactive mode was optional but the default. Change the message to more appropriately report usage when the -i flag is supplied. In addition, use the same division into 3 command formats as the man page. Signed-off-by: Brian Ewins <brian.ewins@xxxxxxxxx> --- git-rebase--interactive.sh | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index a1879e3..b988c30 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -12,22 +12,23 @@ OPTIONS_KEEPDASHDASH= OPTIONS_SPEC="\ -git-rebase [-i] [options] [--] <upstream> [<branch>] -git-rebase [-i] (--continue | --abort | --skip) +git rebase -i [options] [--onto <newbase>] [--] <upstream> [<branch>] +git rebase -i [options] --onto <newbase> --root [--] [<branch>] +git rebase (--continue | --abort | --skip) -- Available options are v,verbose display a diffstat of what changed upstream onto= rebase onto given branch instead of upstream p,preserve-merges try to recreate merges instead of ignoring them s,strategy= use the given merge strategy -m,merge always used (no-op) -i,interactive always used (no-op) +i,interactive interactively edit commits. Implies -m. +m,merge use merging strategies +no-verify override pre-rebase hook from stopping the operation +root rebase all reachable commmits up to the root(s) Actions: continue continue rebasing process abort abort rebasing process and restore original branch skip skip current patch and continue rebasing process -no-verify override pre-rebase hook from stopping the operation -root rebase all reachable commmits up to the root(s) " . git-sh-setup -- 1.6.5 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html