undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

config doc: update dot-repository notes

Browse Source 
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Philip Oakley 2013-09-13 22:23:16 +01:00 committed by Junio C Hamano
parent 431260cc8d
commit b85ecea625
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/config.txt
View File

@ -724,6 +724,8 @@ branch.<name>.remote::
overridden by `branch.<name>.pushremote`. If no remote is overridden by `branch.<name>.pushremote`. If no remote is
configured, or if you are not on any branch, it defaults to configured, or if you are not on any branch, it defaults to
`origin` for fetching and `remote.pushdefault` for pushing. `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:: branch.<name>.pushremote::
When on branch <name>, it overrides `branch.<name>.remote` for When on branch <name>, it overrides `branch.<name>.remote` for
@ -749,8 +751,8 @@ branch.<name>.merge::
Specify multiple values to get an octopus merge. Specify multiple values to get an octopus merge.
If you wish to setup 'git pull' so that it merges into <name> from If you wish to setup 'git pull' so that it merges into <name> from
another branch in the local repository, you can point another branch in the local repository, you can point
branch.<name>.merge to the desired branch, and use the special setting branch.<name>.merge to the desired branch, and use the relative path
`.` (a period) for branch.<name>.remote. setting `.` (a period) for branch.<name>.remote.
branch.<name>.mergeoptions:: branch.<name>.mergeoptions::
Sets default options for merging into branch <name>. The syntax and Sets default options for merging into branch <name>. The syntax and