Martin von Zweigbergk <martin.von.zweigbergk@xxxxxxxxx> writes: > What is the difference between the "options" and "actions" sections? For historical reasons, "git rebase" does not take subcommands in the way many other commands do (e.g. "git bisect start", "git rerere remaining", "git stash save"). Some --option to the command are used for specifying the subcommand. "git rebase --continue", if it were designed to be consistent with the other commands, would have been "git rebase continue" instead. "Actions" part lists them. This is somewhat unfortunate, but is understandable given that "rebase" didn't have its own options at all, and there was only one mode of operation, namely, to start the rebase process. It allowed the user to be terse, i.e. instead off having to say "git rebase onto master", it was sufficient to say "git rebase master". When "git rebase --continue" was introduced (before, you were supposed to say "git am --resolved", which was nonsense from the UI point of view), somebody should have noticed this as a problem and started a process to deprecate the "git rebase <branchname>" and to require explicit subcommand names, just like we did to "git stash [save]", but that didn't happen. Perhaps this is something to consider at 2.0 boundary. -- 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