From: Junio C Hamano <gitster@pobox.com>
To: "Santi Béjar" <santi@agolina.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCHv2 3/4] Documentation: branch.*.merge can also afect 'git-push'
Date: Wed, 01 Apr 2009 23:08:27 -0700 [thread overview]
Message-ID: <7v3acrk2p0.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <adf1fd3d0903301506r65bd9b9bv6bf76c652a051400@mail.gmail.com> (Santi Béjar's message of "Tue, 31 Mar 2009 00:06:30 +0200")
Santi Béjar <santi@agolina.net> writes:
> 2009/3/30 Junio C Hamano <gitster@pobox.com>:
> ...
> Maybe the push.default description needs some enhancements, but this
> [3/4] is true.
>
>> I think the author meant to say if your local branch frotz by default
>> merges changes made to the branch nitfol of the remote repository, "frotz
>> tracks nitfol", but the use of the word "track" for that meaning appears
>> nowhere in Documentation/glossary-content.txt
>
> So we can define:
>
> push.default = "tracking" = "push the current branch to its upstream branch"
>
> The "upstream branch" is defined in branch.name.merge and could also
> be added to glossary-content.
Sounds like a good plan. Please make it so.
next prev parent reply other threads:[~2009-04-02 6:10 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-30 10:11 [PATCHv2 0/4] push.default and branch.<name>.{remote,merge} changes Santi Béjar
2009-03-30 10:11 ` [PATCHv2 1/4] Documentation: enhance branch.<name>.{remote,merge} Santi Béjar
2009-03-30 10:11 ` [PATCHv2 2/4] Documentation: push.default applies to all remotes Santi Béjar
2009-03-30 10:11 ` [PATCHv2 3/4] Documentation: branch.*.merge can also afect 'git-push' Santi Béjar
2009-03-30 10:35 ` Michael J Gruber
2009-03-30 16:47 ` Junio C Hamano
2009-03-30 22:06 ` Santi Béjar
2009-04-02 6:08 ` Junio C Hamano [this message]
2009-03-30 10:11 ` [PATCHv2 4/4] Rename push.default to push.mode Santi Béjar
2009-03-30 10:42 ` Michael J Gruber
2009-03-30 12:37 ` Santi Béjar
2009-03-30 13:06 ` Michael J Gruber
2009-03-30 13:45 ` Jeff King
2009-03-30 14:47 ` Michael J Gruber
2009-03-30 18:02 ` Jeff King
2009-03-31 12:55 ` Michael J Gruber
2009-03-31 13:08 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7v3acrk2p0.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=santi@agolina.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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 NNTP newsgroup(s).