From: Jay Soffian <jaysoffian@gmail.com>
To: "Santi Béjar" <santi@agolina.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 1/4] Documentation: enhance branch.<name>.{remote,merge}
Date: Sat, 28 Mar 2009 21:38:42 -0400 [thread overview]
Message-ID: <76718490903281838s1bc7e908l4702cf9ab020189@mail.gmail.com> (raw)
In-Reply-To: <1238281804-30290-2-git-send-email-santi@agolina.net>
On Sat, Mar 28, 2009 at 7:10 PM, Santi Béjar <santi@agolina.net> wrote:
> branch.<name>.merge::
> + It defines, together with branch.<name>.remote, the tracking branch
> + for the current branch. It tells 'git-fetch'/'git-pull' which
> + branch to merge.
I think it would be clearer to say "the upstream branch for the
current branch", since
it could very well be a local branch, not necessarily a remote tracking branch.
j.
next prev parent reply other threads:[~2009-03-29 1:40 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-28 23:10 [PATCH 0/4] push.default and branch.<name>.{remote,merge} changes Santi Béjar
2009-03-28 23:10 ` [PATCH 1/4] Documentation: enhance branch.<name>.{remote,merge} Santi Béjar
2009-03-29 1:38 ` Jay Soffian [this message]
2009-03-29 10:54 ` Santi Béjar
2009-03-28 23:10 ` [PATCH 2/4] Documentation: push.default applies to all remotes Santi Béjar
2009-03-28 23:10 ` [PATCH 3/4] Documentation: branch.*.merge can also afect 'git-push' Santi Béjar
2009-03-28 23:10 ` [PATCH 4/4] Rename push.default to push.style Santi Béjar
2009-03-30 8:01 ` Finn Arne Gangstad
2009-03-30 8:23 ` Johannes Schindelin
2009-03-30 9:00 ` Santi Béjar
2009-03-30 9:07 ` Santi Béjar
2009-03-30 10:29 ` Jeff King
2009-03-30 12:50 ` Santi Béjar
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=76718490903281838s1bc7e908l4702cf9ab020189@mail.gmail.com \
--to=jaysoffian@gmail.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).