{"thread":{"id":"34987","subject":"[PATCH 1/2] Doc: remote set-head long options","startedAt":"2013-09-21T15:51:44Z","lastAt":"2013-09-27T23:52:56Z","messageCount":4,"participants":["Philip Oakley","Jonathan Nieder"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"227995","messageId":"1379778706-5664-1-git-send-email-philipoakley@iee.org","threadId":"34987","inReplyTo":null,"subject":"[PATCH 0/2] Update 'git remote set-head' doc and uasage","fromName":"Philip Oakley","fromEmail":"philipoakley@iee.org","sentAt":"2013-09-21T15:51:44Z","receivedAt":"2013-09-21T15:51:44Z","isPatch":true,"sender":{"key":"philipoakley@iee.email","avatar":"https://avatars.githubusercontent.com/u/914343?v=4"},"body":"In Junio's recent patch series ([PATCH v3 0/7] Removing the guesswork\nof HEAD in \"clone\" $gmane/234950), his first patch updated t5505: 'fix\n\"set-head --auto with ambiguous HEAD\" test'.\n\nA quick look at the git remote man page showed that --auto was not\ndocumented, nor listed in usage stings.\n\nThis two patch series fixes the documentation and the usage strings.\n\nPhilip Oakley (2):\n  Doc: remote set-head long options\n  remote set-head: show long options in usage\n\n Documentation/git-remote.txt | 6 +++---\n builtin/remote.c             | 4 ++--\n 2 files changed, 5 insertions(+), 5 deletions(-)\n\n-- \n1.8.1.msysgit.1\n"},{"id":"227993","messageId":"1379778706-5664-2-git-send-email-philipoakley@iee.org","threadId":"34987","inReplyTo":"1379778706-5664-1-git-send-email-philipoakley@iee.org","subject":"[PATCH 1/2] Doc: remote set-head long options","fromName":"Philip Oakley","fromEmail":"philipoakley@iee.org","sentAt":"2013-09-21T15:51:45Z","receivedAt":"2013-09-21T15:51:45Z","isPatch":true,"sender":{"key":"philipoakley@iee.email","avatar":"https://avatars.githubusercontent.com/u/914343?v=4"},"body":"Signed-off-by: Philip Oakley <philipoakley@iee.org>\n---\n Documentation/git-remote.txt | 6 +++---\n 1 file changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt\nindex 9c3e3bf..2507c8b 100644\n--- a/Documentation/git-remote.txt\n+++ b/Documentation/git-remote.txt\n@@ -13,7 +13,7 @@ SYNOPSIS\n 'git remote add' [-t <branch>] [-m <master>] [-f] [--[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 set-branches' [--add] <name> <branch>...\n 'git remote set-url' [--push] <name> <newurl> [<oldurl>]\n 'git remote set-url --add' [--push] <name> <newurl>\n@@ -101,9 +101,9 @@ branch. For example, if the default branch for `origin` is set to\n `master`, then `origin` may be specified wherever you would normally\n specify `origin/master`.\n +\n-With `-d`, the symbolic ref `refs/remotes/<name>/HEAD` is deleted.\n+With `-d` or `--delete`, the symbolic ref `refs/remotes/<name>/HEAD` is deleted.\n +\n-With `-a`, the remote is queried to determine its `HEAD`, then the\n+With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the\n symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote\n `HEAD` is pointed at `next`, \"`git remote set-head origin -a`\" will set\n the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will\n-- \n1.8.1.msysgit.1\n"},{"id":"227994","messageId":"1379778706-5664-3-git-send-email-philipoakley@iee.org","threadId":"34987","inReplyTo":"1379778706-5664-1-git-send-email-philipoakley@iee.org","subject":"[PATCH 2/2] remote set-head: show long options in usage","fromName":"Philip Oakley","fromEmail":"philipoakley@iee.org","sentAt":"2013-09-21T15:51:46Z","receivedAt":"2013-09-21T15:51:46Z","isPatch":true,"sender":{"key":"philipoakley@iee.email","avatar":"https://avatars.githubusercontent.com/u/914343?v=4"},"body":"Signed-off-by: Philip Oakley <philipoakley@iee.org>\n---\n builtin/remote.c | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/builtin/remote.c b/builtin/remote.c\nindex eaac3e2..4e14891 100644\n--- a/builtin/remote.c\n+++ b/builtin/remote.c\n@@ -12,7 +12,7 @@ static const char * const builtin_remote_usage[] = {\n \tN_(\"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--mirror=<fetch|push>] <name> <url>\"),\n \tN_(\"git remote rename <old> <new>\"),\n \tN_(\"git remote remove <name>\"),\n-\tN_(\"git remote set-head <name> (-a | -d | <branch>)\"),\n+\tN_(\"git remote set-head <name> (-a | --auto | -d | --delete |<branch>)\"),\n \tN_(\"git remote [-v | --verbose] show [-n] <name>\"),\n \tN_(\"git remote prune [-n | --dry-run] <name>\"),\n \tN_(\"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]\"),\n@@ -39,7 +39,7 @@ static const char * const builtin_remote_rm_usage[] = {\n };\n \n static const char * const builtin_remote_sethead_usage[] = {\n-\tN_(\"git remote set-head <name> (-a | -d | <branch>)\"),\n+\tN_(\"git remote set-head <name> (-a | --auto | -d | --delete | <branch>)\"),\n \tNULL\n };\n \n-- \n1.8.1.msysgit.1\n"},{"id":"228337","messageId":"20130927235256.GP9464@google.com","threadId":"34987","inReplyTo":"1379778706-5664-1-git-send-email-philipoakley@iee.org","subject":"Re: [PATCH 0/2] Update 'git remote set-head' doc and uasage","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2013-09-27T23:52:56Z","receivedAt":"2013-09-27T23:52:56Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Philip Oakley wrote:\n\n> In Junio's recent patch series ([PATCH v3 0/7] Removing the guesswork\n> of HEAD in \"clone\" $gmane/234950), his first patch updated t5505: 'fix\n> \"set-head --auto with ambiguous HEAD\" test'.\n>\n> A quick look at the git remote man page showed that --auto was not\n> documented, nor listed in usage stings.\n\nThanks.\n"}]}