aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2013-10-14 11:07:29 -0700
committerJonathan Nieder <jrnieder@gmail.com>2013-10-14 11:07:29 -0700
commitc766e6f429f48e4e6e7b5609779e6cca501c31f6 (patch)
treed7477b98451aa907f76e750f5128a5b8eba0f75d /Documentation
parentcabb411fcf6a0a0f5058f2fee0f628e9a16a6fcb (diff)
parente49c8f33ab8e401d5d8f308f83e2a2c756377ef1 (diff)
downloadgit-c766e6f429f48e4e6e7b5609779e6cca501c31f6.tar.gz
git-c766e6f429f48e4e6e7b5609779e6cca501c31f6.tar.xz
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
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-remote.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt
index 9c3e3bf83..2507c8bd9 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