aboutsummaryrefslogtreecommitdiff
path: root/builtin
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 /builtin
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 'builtin')
-rw-r--r--builtin/remote.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/remote.c b/builtin/remote.c
index eaac3e201..4e1489109 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
};