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 <philipoakley@iee.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Philip Oakley committed
Sep 13, 2013 at 22:23 UTC
b85ecea625cb990ce9f02793a69fb339bb467e6c
1 file changed
+4
-2
Documentation/config.txt
+4
-2
@@ -724,6 +724,8 @@ branch.<name>.remote::
724
overridden by `branch.<name>.pushremote`. If no remote is
725
configured, or if you are not on any branch, it defaults to
726
`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.
729
730
branch.<name>.pushremote::
731
When on branch <name>, it overrides `branch.<name>.remote` for
@@ -749,8 +751,8 @@ branch.<name>.merge::
751
Specify multiple values to get an octopus merge.
752
If you wish to setup 'git pull' so that it merges into <name> from
753
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.
756
757
branch.<name>.mergeoptions::
758
Sets default options for merging into branch <name>. The syntax and