git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Tay Ray Chuan <rctay89@gmail.com>
To: Ramkumar Ramachandra <artagnon@gmail.com>
Cc: Git List <git@vger.kernel.org>,
	Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>,
	Eric Sunshine <sunshine@sunshineco.com>,
	Jonathan Nieder <jrnieder@gmail.com>
Subject: Re: [PATCH 6/6] remote.c: introduce branch.<name>.pushremote
Date: Wed, 20 Mar 2013 21:03:10 +0800	[thread overview]
Message-ID: <CALUzUxobybPOqsLgEFVOCK2OLOvyqHtAiuyi8wozOSYeWzkhNg@mail.gmail.com> (raw)
In-Reply-To: <1363783501-27981-7-git-send-email-artagnon@gmail.com>

On Wed, Mar 20, 2013 at 8:45 PM, Ramkumar Ramachandra
<artagnon@gmail.com> wrote:
> This new configuration variable overrides `remote.pushdefault` and
> `branch.<name>.remote` for pushes.  In a typical triangular-workflow
> setup, you would want to set `remote.pushdefault` to specify the
> remote to push to for all branches, and use this option to override it
> for a specific branch.
>
> Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
> ---
>  Documentation/config.txt | 18 ++++++++++++++----
>  remote.c                 |  3 +++
>  t/t5516-fetch-push.sh    | 15 +++++++++++++++
>  3 files changed, 32 insertions(+), 4 deletions(-)

Shouldn't this patch be squashed into 5/6 because of...

> diff --git a/Documentation/config.txt b/Documentation/config.txt
> index e813c33..4b9647a 100644
> --- a/Documentation/config.txt
> +++ b/Documentation/config.txt
> @@ -726,9 +726,18 @@ branch.<name>.remote::
>         When on branch <name>, it tells 'git fetch' and 'git push'
>         which remote to fetch from/push to.  The remote to push to
>         may be overridden with `remote.pushdefault` (for all branches).
> -       If no remote is configured, or if you are not on any branch,
> -       it defaults to `origin` for fetching and `remote.pushdefault`
> -       for pushing.
> +       The remote to push to, for the current branch, may be further
> +       overridden by `branch.<name>.pushremote`.  If no remote is
> +       configured, or if you are not on any branch, it defaults to
> +       `origin` for fetching and `remote.pushdefault` for pushing.
> +

...this? (Since this description was introduced in 5/6)

-- 
Cheers,
Ray Chuan

  reply	other threads:[~2013-03-20 13:04 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-20 12:44 [PATCH v2 0/6] Support triangular workflows Ramkumar Ramachandra
2013-03-20 12:44 ` [PATCH 1/6] remote.c: simplify a bit of code using git_config_string() Ramkumar Ramachandra
2013-03-20 18:07   ` Jonathan Nieder
2013-03-20 18:12     ` Ramkumar Ramachandra
2013-03-20 12:44 ` [PATCH 2/6] t5516 (fetch-push): update test description Ramkumar Ramachandra
2013-03-20 18:22   ` Jonathan Nieder
2013-03-20 18:33     ` Ramkumar Ramachandra
2013-03-20 18:35       ` Jonathan Nieder
2013-03-20 12:44 ` [PATCH 3/6] t5516 (fetch-push): introduce mk_test_with_name() Ramkumar Ramachandra
2013-03-20 18:28   ` Jonathan Nieder
2013-03-20 18:38     ` Ramkumar Ramachandra
2013-03-20 18:41       ` Jonathan Nieder
2013-03-20 18:58         ` Jeff King
2013-03-20 19:52           ` Junio C Hamano
2013-03-20 20:00           ` Jonathan Nieder
2013-03-20 12:44 ` [PATCH 4/6] remote.c: introduce a way to have different remotes for fetch/push Ramkumar Ramachandra
2013-03-20 18:30   ` Jonathan Nieder
2013-03-20 19:03   ` Junio C Hamano
2013-03-20 19:43     ` Ramkumar Ramachandra
2013-03-20 19:48       ` Junio C Hamano
2013-03-20 12:45 ` [PATCH 5/6] remote.c: introduce remote.pushdefault Ramkumar Ramachandra
2013-03-20 18:32   ` Jonathan Nieder
2013-03-20 18:53     ` Junio C Hamano
2013-03-20 19:46     ` Ramkumar Ramachandra
2013-03-20 12:45 ` [PATCH 6/6] remote.c: introduce branch.<name>.pushremote Ramkumar Ramachandra
2013-03-20 13:03   ` Tay Ray Chuan [this message]
2013-03-20 13:35     ` Ramkumar Ramachandra
2013-03-20 13:06 ` [PATCH v2 0/6] Support triangular workflows Tay Ray Chuan
2013-03-22  7:44   ` Ramkumar Ramachandra
2013-03-20 23:04 ` Philip Oakley
2013-03-22  7:41   ` Ramkumar Ramachandra
2013-03-22 15:16   ` Junio C Hamano
2013-03-23 12:42     ` Ramkumar Ramachandra
2013-03-22  7:52 [PATCH v3 " Ramkumar Ramachandra
2013-03-22  7:52 ` [PATCH 6/6] remote.c: introduce branch.<name>.pushremote Ramkumar Ramachandra
2013-03-22 17:37   ` Junio C Hamano
2013-03-28 13:26 [PATCH v4 0/6] Support triangular workflows Ramkumar Ramachandra
2013-03-28 13:26 ` [PATCH 6/6] remote.c: introduce branch.<name>.pushremote Ramkumar Ramachandra
2013-04-02  7:40 [PATCH 0/6] Re-roll rr/triangle Ramkumar Ramachandra
2013-04-02  7:40 ` [PATCH 6/6] remote.c: introduce branch.<name>.pushremote Ramkumar Ramachandra

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=CALUzUxobybPOqsLgEFVOCK2OLOvyqHtAiuyi8wozOSYeWzkhNg@mail.gmail.com \
    --to=rctay89@gmail.com \
    --cc=artagnon@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jrnieder@gmail.com \
    --cc=peff@peff.net \
    --cc=sunshine@sunshineco.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).