From: "Junio C Hamano" <gitster@xxxxxxxxx>
Sent: Friday, September 13, 2013 11:28 PM
Subject: Re: [PATCH V2 2/3] config doc: update dot-repository notes
Philip Oakley <philipoakley@xxxxxxx> writes:
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.
Looks good.
It naturally follows that this is also valid:
[branch "master"]
merge = refs/heads/master
remote = git://git.kernel.org/pub/scm/git/git.git
and running "git pull" while on your 'master'.
This is because branch.<name>.remote usually is spelled with a
nickname that refers to the [remote <nickname>] section, but it does
not have to be; it can use a URL to refer to the remote repository.
Signed-off-by: Philip Oakley <philipoakley@xxxxxxx>
---
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.
This may need something extra because it doesn't say where it is
relative to, nor comment on git_dir discovery (see patch 1 comments,
likewise patch 3)
branch.<name>.mergeoptions::
Sets default options for merging into branch <name>. The syntax and
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html