git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Namhyung Kim <namhyung@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: [PATCH] git-remote.txt: fix wrong remote refspec
Date: Thu, 23 Jun 2011 13:45:19 +0900	[thread overview]
Message-ID: <1308804319-6354-1-git-send-email-namhyung@gmail.com> (raw)

$GIT_DIR/remotes/<name>/HEAD should be
$GIT_DIR/refs/remotes/<name>/HEAD.

Signed-off-by: Namhyung Kim <namhyung@gmail.com>
---
 Documentation/git-remote.txt |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt
index 528f34a..f5b6e8b 100644
--- a/Documentation/git-remote.txt
+++ b/Documentation/git-remote.txt
@@ -64,7 +64,7 @@ refspec for the remote to track all branches under
 is created.  You can give more than one `-t <branch>` to track
 multiple branches without grabbing all branches.
 +
-With `-m <master>` option, `$GIT_DIR/remotes/<name>/HEAD` is set
+With `-m <master>` option, `$GIT_DIR/refs/remotes/<name>/HEAD` is set
 up to point at remote's `<master>` branch. See also the set-head command.
 +
 When a fetch mirror is created with `\--mirror=fetch`, the refs will not
@@ -92,23 +92,23 @@ configuration settings for the remote are removed.
 
 'set-head'::
 
-Sets or deletes the default branch (`$GIT_DIR/remotes/<name>/HEAD`) for
+Sets or deletes the default branch (`$GIT_DIR/refs/remotes/<name>/HEAD`) for
 the named remote. Having a default branch for a remote is not required,
 but allows the name of the remote to be specified in lieu of a specific
 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`, `$GIT_DIR/remotes/<name>/HEAD` is deleted.
+With `-d`, `$GIT_DIR/refs/remotes/<name>/HEAD` is deleted.
 +
 With `-a`, the remote is queried to determine its `HEAD`, then
-`$GIT_DIR/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote
+`$GIT_DIR/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
 `$GIT_DIR/refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will
 only work if `refs/remotes/origin/next` already exists; if not it must be
 fetched first.
 +
-Use `<branch>` to set `$GIT_DIR/remotes/<name>/HEAD` explicitly. e.g., "git
+Use `<branch>` to set `$GIT_DIR/refs/remotes/<name>/HEAD` explicitly. e.g., "git
 remote set-head origin master" will set `$GIT_DIR/refs/remotes/origin/HEAD` to
 `refs/remotes/origin/master`. This will only work if
 `refs/remotes/origin/master` already exists; if not it must be fetched first.
-- 
1.7.5.2

             reply	other threads:[~2011-06-23  4:45 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-06-23  4:45 Namhyung Kim [this message]
2011-06-23  5:35 ` [PATCH] git-remote.txt: fix wrong remote refspec Junio C Hamano
2011-06-23  6:17   ` Namhyung Kim
2011-06-23  8:12     ` [PATCH v2] " Namhyung Kim
2011-06-23 15:33   ` [PATCH] " Junio C Hamano
2011-06-23 16:03     ` Namhyung Kim
2011-06-23 16:52     ` [PATCH 0/5] Clarify "refs" Junio C Hamano
2011-06-23 16:52       ` [PATCH 1/5] check-ref-format doc: de-emphasize the implementation detail of a ref Junio C Hamano
2011-06-23 22:14         ` Eric Sunshine
2011-06-23 16:52       ` [PATCH 2/5] git.txt: " Junio C Hamano
2011-06-23 16:52       ` [PATCH 3/5] glossary: update description of "tag" Junio C Hamano
2011-06-23 22:19         ` Eric Sunshine
2011-06-23 16:52       ` [PATCH 4/5] glossary: update description of head and ref Junio C Hamano
2011-06-23 16:52       ` [PATCH 5/5] glossary: clarify description of HEAD Junio C Hamano
2011-06-23 17:06         ` Carlos Martín Nieto
2011-06-23 17:12           ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1308804319-6354-1-git-send-email-namhyung@gmail.com \
    --to=namhyung@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).