Re: remote.<name>.merge missing from the git-config man page?

On Mär 08 2021, Taylor Blau wrote:

On Mon, Mar 08, 2021 at 09:14:33PM +0100, Andreas Schwab wrote:

quoted

On Mär 08 2021, Taylor Blau wrote:

quoted

diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index ab103c82cf..a953c7c387 100644
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt

@@ -600,7 +600,7 @@ EXAMPLES

 `git push origin`::
 	Without additional configuration, pushes the current branch to
-	the configured upstream (`remote.origin.merge` configuration
+	the configured upstream (`branch.<name>.merge` configuration
 	variable) if it has the same name as the current branch, and
 	errors out without pushing otherwise.

That doesn't say what <name> is.  Is that supposed to be <branch>?
Also, what is "it" referring to in "if it has the same name"?

<name> refers to the currently-checked-out branch's local name. (That's
how it's used in Documentation/config/branch.txt).

The antecedent is "the current branch", so I think that this one may
already be quite clear if you read past the parenthesis.

That doesn't make sense: "if the current branch has the same name as the
current branch".

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510  2552 DF73 E780 A9DA AEC1
"And now for something completely different."

On Mon, Mar 08, 2021 at 09:41:14PM +0100, Andreas Schwab wrote:

quoted

quoted

quoted

 `git push origin`::
 	Without additional configuration, pushes the current branch to
-	the configured upstream (`remote.origin.merge` configuration
+	the configured upstream (`branch.<name>.merge` configuration
 	variable) if it has the same name as the current branch, and
 	errors out without pushing otherwise.

That doesn't say what <name> is.  Is that supposed to be <branch>?
Also, what is "it" referring to in "if it has the same name"?

<name> refers to the currently-checked-out branch's local name. (That's
how it's used in Documentation/config/branch.txt).

The antecedent is "the current branch", so I think that this one may
already be quite clear if you read past the parenthesis.

That doesn't make sense: "if the current branch has the same name as the
current branch".

OK, now I see where your confusion is. I was incorrect in saying the
antecedent was "the current branch"; it should instead by "the
configured upstream". IOW, "if both your and the remote copy call the
branch you have checked out the same thing."

Re-reading the original wording, I still think that it is clear enough
to communicate what I wrote above, but if there is an alternative
wording you find clearer, I would certainly welcome suggestions.

Thanks,
Taylor