git-fetch, git-branch: Support local --track via a special remote '.'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index aaae9ac3052b5a4de6ec53817e79797626f7da31..953acaee4c9b692802a4e98861dac8ceec315d54 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -272,6 +272,10 @@ branch.<name>.merge::
        `git fetch`) to lookup the default branch for merging. Without
        this option, `git pull` defaults to merge the first refspec fetched.
        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.
 
 color.branch::
        A boolean to enable/disable color in the output of