git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
* Wrong configuration variable mentioned in git-push documentation (examples section)
@ 2021-02-22  5:07 Adam Sharafeddine
  2021-02-25 13:57 ` Philippe Blain
  0 siblings, 1 reply; 2+ messages in thread
From: Adam Sharafeddine @ 2021-02-22  5:07 UTC (permalink / raw)
  To: git

Hello

In the file Documentation/git-push.txt under the EXAMPLES section,
specifically under
`git push origin`::, remote.origin.merge configuration variable is
said to configure the
upstream branch for the origin remote, when in fact it should be
branch.<name>.merge,
where <name> is the name of the local branch at which HEAD is
currently pointing to.

Here's en excerpt:

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


I'm still learning Git so I thought I would share this with you (I got
confused reading
the examples). Maybe I'll learn something new or/and correct the
aforementioned error.

Regards

--
Adam

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: Wrong configuration variable mentioned in git-push documentation (examples section)
  2021-02-22  5:07 Wrong configuration variable mentioned in git-push documentation (examples section) Adam Sharafeddine
@ 2021-02-25 13:57 ` Philippe Blain
  0 siblings, 0 replies; 2+ messages in thread
From: Philippe Blain @ 2021-02-25 13:57 UTC (permalink / raw)
  To: Adam Sharafeddine, git

Hi Adam,

Le 2021-02-22 à 00:07, Adam Sharafeddine a écrit :
> Hello
> 
> In the file Documentation/git-push.txt under the EXAMPLES section,
> specifically under
> `git push origin`::, remote.origin.merge configuration variable is
> said to configure the
> upstream branch for the origin remote, when in fact it should be
> branch.<name>.merge,
> where <name> is the name of the local branch at which HEAD is
> currently pointing to.
> 
> Here's en excerpt:
> 
>> `git push origin`::
>>          Without additional configuration, pushes the current branch to
>>          the configured upstream (`remote.origin.merge` configuration
>>          variable) if it has the same name as the current branch, and
>>          errors out without pushing otherwise.
> 
> 
> I'm still learning Git so I thought I would share this with you (I got
> confused reading
> the examples). Maybe I'll learn something new or/and correct the
> aforementioned error.
> 

You are completely right, that example seems to use an old and now non-existent
(at least, undocumented in git-config(1) [1]) configuration variable.
I encourage you to fix it yourself and submit a patch :) See [2] for a nice tutorial on
how to do this if you are interested.

Cheers,
Philippe.


[1] https://git-scm.com/docs/git-config
[2] https://git-scm.com/docs/MyFirstContribution

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-02-25 14:01 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-22  5:07 Wrong configuration variable mentioned in git-push documentation (examples section) Adam Sharafeddine
2021-02-25 13:57 ` Philippe Blain

Code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).