Skip to content

Commit b85ecea

Browse files
Philip Oakleygitster
authored andcommitted
config doc: update dot-repository notes
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 431260c commit b85ecea

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

Documentation/config.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -724,6 +724,8 @@ branch.<name>.remote::
724724
overridden by `branch.<name>.pushremote`. If no remote is
725725
configured, or if you are not on any branch, it defaults to
726726
`origin` for fetching and `remote.pushdefault` for pushing.
727+
Additionally, `.` (a period) is the current local repository
728+
(a dot-repository), see `branch.<name>.merge`'s final note below.
727729

728730
branch.<name>.pushremote::
729731
When on branch <name>, it overrides `branch.<name>.remote` for
@@ -749,8 +751,8 @@ branch.<name>.merge::
749751
Specify multiple values to get an octopus merge.
750752
If you wish to setup 'git pull' so that it merges into <name> from
751753
another branch in the local repository, you can point
752-
branch.<name>.merge to the desired branch, and use the special setting
753-
`.` (a period) for branch.<name>.remote.
754+
branch.<name>.merge to the desired branch, and use the relative path
755+
setting `.` (a period) for branch.<name>.remote.
754756

755757
branch.<name>.mergeoptions::
756758
Sets default options for merging into branch <name>. The syntax and

0 commit comments

Comments
 (0)