mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
branch,checkout: fix --track documentation
Document that the accepted variants of the --track option are --track, --track=direct, and --track=inherit. The equal sign in the latter two cannot be replaced with whitespace; in general optional arguments need to be attached firmly to their option. Put "direct" consistently before "inherit", if only for the reasons that the former is the default, explained first in the documentation, and comes before the latter alphabetically. Mention both modes in the short help so that readers don't have to look them up in the full documentation. They are literal strings and thus untranslatable. PARSE_OPT_LITERAL_ARGHELP is inferred due to the pipe and parenthesis characters, so we don't have to provide that flag explicitly. Mention that -t has the same effect as --track and --track=direct. There is no way to specify inherit mode using the short option, because short options generally don't accept optional arguments. Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
15f002812f
commit
6327f0efed
|
@ -16,7 +16,7 @@ SYNOPSIS
|
|||
[--points-at <object>] [--format=<format>]
|
||||
[(-r | --remotes) | (-a | --all)]
|
||||
[--list] [<pattern>...]
|
||||
'git branch' [--track [direct|inherit] | --no-track] [-f] <branchname> [<start-point>]
|
||||
'git branch' [--track[=(direct|inherit)] | --no-track] [-f] <branchname> [<start-point>]
|
||||
'git branch' (--set-upstream-to=<upstream> | -u <upstream>) [<branchname>]
|
||||
'git branch' --unset-upstream [<branchname>]
|
||||
'git branch' (-m | -M) [<oldbranch>] <newbranch>
|
||||
|
@ -206,7 +206,7 @@ This option is only applicable in non-verbose mode.
|
|||
Display the full sha1s in the output listing rather than abbreviating them.
|
||||
|
||||
-t::
|
||||
--track [inherit|direct]::
|
||||
--track[=(direct|inherit)]::
|
||||
When creating a new branch, set up `branch.<name>.remote` and
|
||||
`branch.<name>.merge` configuration entries to set "upstream" tracking
|
||||
configuration for the new branch. This
|
||||
|
@ -216,11 +216,11 @@ This option is only applicable in non-verbose mode.
|
|||
upstream when the new branch is checked out.
|
||||
+
|
||||
The exact upstream branch is chosen depending on the optional argument:
|
||||
`--track` or `--track direct` means to use the start-point branch itself as the
|
||||
upstream; `--track inherit` means to copy the upstream configuration of the
|
||||
start-point branch.
|
||||
`-t`, `--track`, or `--track=direct` means to use the start-point branch
|
||||
itself as the upstream; `--track=inherit` means to copy the upstream
|
||||
configuration of the start-point branch.
|
||||
+
|
||||
`--track direct` is the default when the start point is a remote-tracking branch.
|
||||
`--track=direct` is the default when the start point is a remote-tracking branch.
|
||||
Set the branch.autoSetupMerge configuration variable to `false` if you
|
||||
want `git switch`, `git checkout` and `git branch` to always behave as if `--no-track`
|
||||
were given. Set it to `always` if you want this behavior when the
|
||||
|
|
|
@ -156,7 +156,7 @@ of it").
|
|||
linkgit:git-branch[1] for details.
|
||||
|
||||
-t::
|
||||
--track [direct|inherit]::
|
||||
--track[=(direct|inherit)]::
|
||||
When creating a new branch, set up "upstream" configuration. See
|
||||
"--track" in linkgit:git-branch[1] for details.
|
||||
+
|
||||
|
|
|
@ -632,7 +632,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
|
|||
OPT__VERBOSE(&filter.verbose,
|
||||
N_("show hash and subject, give twice for upstream branch")),
|
||||
OPT__QUIET(&quiet, N_("suppress informational messages")),
|
||||
OPT_CALLBACK_F('t', "track", &track, N_("mode"),
|
||||
OPT_CALLBACK_F('t', "track", &track, "(direct|inherit)",
|
||||
N_("set branch tracking configuration"),
|
||||
PARSE_OPT_OPTARG,
|
||||
parse_opt_tracking_mode),
|
||||
|
|
|
@ -1530,7 +1530,7 @@ static struct option *add_common_switch_branch_options(
|
|||
{
|
||||
struct option options[] = {
|
||||
OPT_BOOL('d', "detach", &opts->force_detach, N_("detach HEAD at named commit")),
|
||||
OPT_CALLBACK_F('t', "track", &opts->track, N_("mode"),
|
||||
OPT_CALLBACK_F('t', "track", &opts->track, "(direct|inherit)",
|
||||
N_("set branch tracking configuration"),
|
||||
PARSE_OPT_OPTARG,
|
||||
parse_opt_tracking_mode),
|
||||
|
|
Loading…
Reference in a new issue