From: Junio C Hamano Date: Fri, 16 Mar 2007 10:21:07 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.0.4-404-gdbb2 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6e149c0a0163bc7bdc43528eaa9c219db135418e;p=git.git Autogenerated HTML docs for v1.5.0.4-404-gdbb2 --- diff --git a/config.txt b/config.txt index aaae9ac30..953acaee4 100644 --- a/config.txt +++ b/config.txt @@ -272,6 +272,10 @@ branch..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 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. color.branch:: A boolean to enable/disable color in the output of diff --git a/git-config.html b/git-config.html index cbcf4d622..ba6802199 100644 --- a/git-config.html +++ b/git-config.html @@ -920,6 +920,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.

@@ -1519,7 +1523,7 @@ transfer.unpackLimit