X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=Documentation%2Fconfig.txt;h=edf50cd2113e73daa0a05c16a416424441f010f3;hb=e2b7eaf0ca3897940961d23392d4ff718867ea9f;hp=d4a476e2ff9322348df099bfdfbba2832c8d47a4;hpb=d55e7c3acf72413563e695a19f7f66efac442064;p=git.git

diff --git a/Documentation/config.txt b/Documentation/config.txt
index d4a476e2f..edf50cd21 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -324,10 +324,11 @@ branch.<name>.remote::
 	If this option is not given, `git fetch` defaults to remote "origin".
 
 branch.<name>.merge::
-	When in branch <name>, it tells `git fetch` the default refspec to
-	be marked for merging in FETCH_HEAD. The value has exactly to match
-	a remote part of one of the refspecs which are fetched from the remote
-	given by "branch.<name>.remote".
+	When in branch <name>, it tells `git fetch` the default
+	refspec to be marked for merging in FETCH_HEAD. The value is
+	handled like the remote part of a refspec, and must match a
+	ref which is fetched from the remote given by
+	"branch.<name>.remote".
 	The merge information is used by `git pull` (which at first calls
 	`git fetch`) to lookup the default branch for merging. Without
 	this option, `git pull` defaults to merge the first refspec fetched.