mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
Merge branch 'po/remote-set-head-usage'
* po/remote-set-head-usage: remote set-head -h: add long options to synopsis remote doc: document long forms of set-head options
This commit is contained in:
commit
c766e6f429
|
@ -13,7 +13,7 @@ SYNOPSIS
|
||||||
'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=<fetch|push>] <name> <url>
|
'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=<fetch|push>] <name> <url>
|
||||||
'git remote rename' <old> <new>
|
'git remote rename' <old> <new>
|
||||||
'git remote remove' <name>
|
'git remote remove' <name>
|
||||||
'git remote set-head' <name> (-a | -d | <branch>)
|
'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)
|
||||||
'git remote set-branches' [--add] <name> <branch>...
|
'git remote set-branches' [--add] <name> <branch>...
|
||||||
'git remote set-url' [--push] <name> <newurl> [<oldurl>]
|
'git remote set-url' [--push] <name> <newurl> [<oldurl>]
|
||||||
'git remote set-url --add' [--push] <name> <newurl>
|
'git remote set-url --add' [--push] <name> <newurl>
|
||||||
|
@ -101,9 +101,9 @@ branch. For example, if the default branch for `origin` is set to
|
||||||
`master`, then `origin` may be specified wherever you would normally
|
`master`, then `origin` may be specified wherever you would normally
|
||||||
specify `origin/master`.
|
specify `origin/master`.
|
||||||
+
|
+
|
||||||
With `-d`, the symbolic ref `refs/remotes/<name>/HEAD` is deleted.
|
With `-d` or `--delete`, the symbolic ref `refs/remotes/<name>/HEAD` is deleted.
|
||||||
+
|
+
|
||||||
With `-a`, the remote is queried to determine its `HEAD`, then the
|
With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the
|
||||||
symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote
|
symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote
|
||||||
`HEAD` is pointed at `next`, "`git remote set-head origin -a`" will set
|
`HEAD` is pointed at `next`, "`git remote set-head origin -a`" will set
|
||||||
the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will
|
the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will
|
||||||
|
|
|
@ -12,7 +12,7 @@ static const char * const builtin_remote_usage[] = {
|
||||||
N_("git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--mirror=<fetch|push>] <name> <url>"),
|
N_("git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--mirror=<fetch|push>] <name> <url>"),
|
||||||
N_("git remote rename <old> <new>"),
|
N_("git remote rename <old> <new>"),
|
||||||
N_("git remote remove <name>"),
|
N_("git remote remove <name>"),
|
||||||
N_("git remote set-head <name> (-a | -d | <branch>)"),
|
N_("git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"),
|
||||||
N_("git remote [-v | --verbose] show [-n] <name>"),
|
N_("git remote [-v | --verbose] show [-n] <name>"),
|
||||||
N_("git remote prune [-n | --dry-run] <name>"),
|
N_("git remote prune [-n | --dry-run] <name>"),
|
||||||
N_("git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"),
|
N_("git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"),
|
||||||
|
@ -39,7 +39,7 @@ static const char * const builtin_remote_rm_usage[] = {
|
||||||
};
|
};
|
||||||
|
|
||||||
static const char * const builtin_remote_sethead_usage[] = {
|
static const char * const builtin_remote_sethead_usage[] = {
|
||||||
N_("git remote set-head <name> (-a | -d | <branch>)"),
|
N_("git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"),
|
||||||
NULL
|
NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue