Merge branch 'du/get-tar-commit-id-is-plumbing' into maint

diff --git a/builtin/pull.c b/builtin/pull.c
index 53bc5facfdabd05934a351091f2040744b2575ca..681c127a07071c98641972227a28dbe7f77eaf70 100644 (file)
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -135,7 +135,7 @@ static struct option pull_options[] = {
        /* Options passed to git-merge or git-rebase */
        OPT_GROUP(N_("Options related to merging")),
        { OPTION_CALLBACK, 'r', "rebase", &opt_rebase,
-         "false|true|merges|preserve|interactive",
+         "(false|true|merges|preserve|interactive)",
          N_("incorporate changes by rebasing rather than merging"),
          PARSE_OPT_OPTARG, parse_opt_rebase },
        OPT_PASSTHRU('n', NULL, &opt_diffstat, NULL,