From: "Jay Soffian" <jaysoffian@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>
Subject: Re: [PATCH 1/2] branch: optionally setup branch.*.merge from upstream local branches
Date: Tue, 19 Feb 2008 11:33:36 -0500 [thread overview]
Message-ID: <76718490802190833p68d361b4jf93ac196fe671d6b@mail.gmail.com> (raw)
In-Reply-To: <1203438278-73786-1-git-send-email-jaysoffian@gmail.com>
On Feb 19, 2008 11:24 AM, Jay Soffian <jaysoffian@gmail.com> wrote:
> git branch / git checkout -b now honor --track when the upstream branch
> is local. Previously --track was silently ignored for local upstream
> branches.
>
> The configuration setting branch.autosetupmerge can now be set to
> "always" which is equivalent to using --track. Setting
> branch.autosetupmerge to boolean true will retains the former behavior
> of only setting up branch.*.merge for remote upstream branches.
I re-used my commit message w/o thinking enough. The truth is:
* '--track' fails if the starting point isn't a branch.
* autosetupmerge=always sets up tracking if the starting point is a branch
(local or remote), otherwise (if starting point is not a branch) it is
ignored.
j.
next prev parent reply other threads:[~2008-02-19 16:34 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-19 16:24 [PATCH 1/2] branch: optionally setup branch.*.merge from upstream local branches Jay Soffian
2008-02-19 16:24 ` [PATCH 2/2] doc: documentation update for the branch track changes Jay Soffian
2008-02-19 21:34 ` Junio C Hamano
2008-02-19 22:09 ` Jay Soffian
2008-02-19 16:33 ` Jay Soffian [this message]
2008-02-19 16:45 ` [PATCH 1/2] branch: optionally setup branch.*.merge from upstream local branches Johannes Schindelin
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=76718490802190833p68d361b4jf93ac196fe671d6b@mail.gmail.com \
--to=jaysoffian@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).