From b85ecea625cb990ce9f02793a69fb339bb467e6c Mon Sep 17 00:00:00 2001 From: Philip Oakley Date: Fri, 13 Sep 2013 22:23:16 +0100 Subject: [PATCH] config doc: update dot-repository notes branch..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..merge note. Signed-off-by: Philip Oakley Signed-off-by: Junio C Hamano --- Documentation/config.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index 0fa3f89c01..0614f338e7 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -724,6 +724,8 @@ branch..remote:: overridden by `branch..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..merge`'s final note below. branch..pushremote:: When on branch , it overrides `branch..remote` for @@ -749,8 +751,8 @@ branch..merge:: Specify multiple values to get an octopus merge. If you wish to setup 'git pull' so that it merges into from another branch in the local repository, you can point - branch..merge to the desired branch, and use the special setting - `.` (a period) for branch..remote. + branch..merge to the desired branch, and use the relative path + setting `.` (a period) for branch..remote. branch..mergeoptions:: Sets default options for merging into branch . The syntax and -- 2.11.4.GIT