All of lore.kernel.org
 help / color / mirror / Atom feed
From: Philip Oakley <philipoakley@iee.org>
To: GitList <git@vger.kernel.org>, Junio C Hamano <gitster@pobox.com>
Cc: Jonathan Nieder <jrnieder@gmail.com>,
	Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH V2 2/3] config doc: update dot-repository notes
Date: Fri, 13 Sep 2013 22:23:16 +0100	[thread overview]
Message-ID: <1379107397-964-3-git-send-email-philipoakley@iee.org> (raw)
In-Reply-To: <1379107397-964-1-git-send-email-philipoakley@iee.org>

branch.<name>.remote can be set to '.' (period) as the repository
path (URL) as part of the remote name dwimmery. Tell the reader.

Such relative paths are not 'special'. Correct the branch.<name>.merge
note.

Signed-off-by: Philip Oakley <philipoakley@iee.org>
---
 Documentation/config.txt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 599ca52..da63043 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -718,6 +718,8 @@ branch.<name>.remote::
 	overridden by `branch.<name>.pushremote`.  If no remote is
 	configured, or if you are not on any branch, it defaults to
 	`origin` for fetching and `remote.pushdefault` for pushing.
+	Additionally, `.` (a period) is the current local repository
+	(a dot-repository), see `branch.<name>.merge`'s final note below.
 
 branch.<name>.pushremote::
 	When on branch <name>, it overrides `branch.<name>.remote` for
@@ -743,8 +745,8 @@ branch.<name>.merge::
 	Specify multiple values to get an octopus merge.
 	If you wish to setup 'git pull' so that it merges into <name> from
 	another branch in the local repository, you can point
-	branch.<name>.merge to the desired branch, and use the special setting
-	`.` (a period) for branch.<name>.remote.
+	branch.<name>.merge to the desired branch, and use the relative path
+	setting `.` (a period) for branch.<name>.remote.
 
 branch.<name>.mergeoptions::
 	Sets default options for merging into branch <name>. The syntax and
-- 
1.8.1.msysgit.1

  parent reply	other threads:[~2013-09-13 21:23 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-19 11:54 [RFC/PATCH 0/2] Extend dot repository documentation Philip Oakley
2013-05-19 11:54 ` [RFC/PATCH 1/2] config doc: add dot-repository note Philip Oakley
2013-05-19 17:43   ` Jonathan Nieder
2013-05-20 17:50     ` Junio C Hamano
2013-05-20 21:10       ` Philip Oakley
2013-05-19 11:54 ` [RFC/PATCH 2/2] doc: command line interface (cli) dot-repository dwimmery Philip Oakley
2013-05-19 17:39   ` Jonathan Nieder
2013-05-19 22:29     ` Philip Oakley
2013-05-20 17:55     ` Junio C Hamano
2013-05-20 21:09       ` Philip Oakley
2013-05-20 22:22         ` Junio C Hamano
2013-05-21  7:47           ` Philip Oakley
2013-05-21 16:23             ` Junio C Hamano
2013-05-21 21:21               ` Felipe Contreras
2013-05-21 22:33                 ` Philip Oakley
2013-05-21 23:03                   ` Felipe Contreras
2013-05-21 23:24                     ` Junio C Hamano
2013-05-22  0:27                       ` Felipe Contreras
2013-05-22  0:50                         ` Junio C Hamano
2013-05-22  2:57                           ` Felipe Contreras
2013-05-22 16:50                             ` Junio C Hamano
2013-05-22 22:12                               ` Felipe Contreras
2013-05-22 22:09                     ` Philip Oakley
2013-05-22 22:15                       ` Felipe Contreras
2013-09-13 21:23 ` [PATCH V2 0/3] Extend dot repository documentation Philip Oakley
2013-09-13 21:23   ` [PATCH V2 1/3] Doc URLs: relative paths imply the dot-respository Philip Oakley
2013-09-13 22:21     ` Junio C Hamano
2013-09-14 20:47       ` Philip Oakley
2013-09-13 21:23   ` Philip Oakley [this message]
2013-09-13 22:28     ` [PATCH V2 2/3] config doc: update dot-repository notes Junio C Hamano
2013-09-14 20:47       ` Philip Oakley
2013-09-13 21:23   ` [PATCH V2 3/3] doc: command line interface (cli) dot-repository dwimmery Philip Oakley
2013-09-13 22:31     ` 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=1379107397-964-3-git-send-email-philipoakley@iee.org \
    --to=philipoakley@iee.org \
    --cc=felipe.contreras@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jrnieder@gmail.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.