diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2013-10-14 22:07:29 +0400 |
|---|---|---|
| committer | Jonathan Nieder <jrnieder@gmail.com> | 2013-10-14 22:07:29 +0400 |
| commit | c766e6f429f48e4e6e7b5609779e6cca501c31f6 (patch) | |
| tree | d7477b98451aa907f76e750f5128a5b8eba0f75d | |
| parent | cabb411fcf6a0a0f5058f2fee0f628e9a16a6fcb (diff) | |
| parent | e49c8f33ab8e401d5d8f308f83e2a2c756377ef1 (diff) | |
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
| -rw-r--r-- | Documentation/git-remote.txt | 6 | ||||
| -rw-r--r-- | builtin/remote.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt index 9c3e3bf83a..2507c8bd91 100644 --- a/Documentation/git-remote.txt +++ b/Documentation/git-remote.txt @@ -13,7 +13,7 @@ SYNOPSIS 'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=<fetch|push>] <name> <url> 'git remote rename' <old> <new> '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-url' [--push] <name> <newurl> [<oldurl>] '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 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 `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 diff --git a/builtin/remote.c b/builtin/remote.c index eaac3e2012..4e14891095 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @@ -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 rename <old> <new>"), 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 prune [-n | --dry-run] <name>"), 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[] = { - N_("git remote set-head <name> (-a | -d | <branch>)"), + N_("git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"), NULL }; |