From: Junio C Hamano <gitster@pobox.com>
To: Duy Nguyen <pclouds@gmail.com>
Cc: Ben Peart <peartben@gmail.com>,
Git Mailing List <git@vger.kernel.org>,
Ben Peart <benpeart@microsoft.com>, Jeff King <peff@peff.net>,
Eric Sunshine <sunshine@sunshineco.com>
Subject: Re: [PATCH v3 2/3] reset: add new reset.quiet config setting
Date: Thu, 25 Oct 2018 10:12:49 +0900 [thread overview]
Message-ID: <xmqqa7n2n81a.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <CACsJy8Bkx5QS_4QV13FHpbZmhO=0oc3_BsBPQKdtjq6aouALFA@mail.gmail.com> (Duy Nguyen's message of "Wed, 24 Oct 2018 16:54:06 +0200")
Duy Nguyen <pclouds@gmail.com> writes:
> OK. Just to be sure we're on the same page. Am I waiting for all
> config changes to land in 'master', or do I rebase my series on
> 'next'? I usually base on 'master' but the mention of 'next' here
> confuses me a bit.
I was hoping that you can do something like:
$ git fetch https://github.com/gitster/git \
--refmap=refs/heads/*:refs/remotes/broken-out/* \
bp/reset-quiet master
$ git checkout broken-out/master^0
$ git merge broekn-out/bp/reset-quiet
$ git rebase HEAD np/config-split
once it is clear to everybody that Ben's reset series is ready to be
merged to 'next' (or it actually hits 'next').
next prev parent reply other threads:[~2018-10-25 1:12 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-17 16:40 [PATCH v1 0/2] speed up git reset Ben Peart
2018-10-17 16:40 ` [PATCH v1 1/2] reset: don't compute unstaged changes after reset when --quiet Ben Peart
2018-10-17 18:14 ` Eric Sunshine
2018-10-17 18:22 ` Jeff King
2018-10-18 3:40 ` Junio C Hamano
2018-10-18 6:36 ` Jeff King
2018-10-18 18:15 ` Ben Peart
2018-10-18 18:26 ` Duy Nguyen
2018-10-18 19:03 ` Ben Peart
2018-10-19 0:34 ` Junio C Hamano
2018-10-17 16:40 ` [PATCH v1 2/2] reset: add new reset.quietDefault config setting Ben Peart
2018-10-17 18:19 ` Eric Sunshine
2018-10-17 18:23 ` Jeff King
2018-10-23 9:13 ` Ævar Arnfjörð Bjarmason
2018-10-23 18:11 ` Ben Peart
2018-10-23 20:02 ` Jeff King
2018-10-23 20:03 ` Ævar Arnfjörð Bjarmason
2018-10-24 15:48 ` Recommended configurations (was Re: [PATCH v1 2/2] reset: add new reset.quietDefault config setting) Derrick Stolee
2018-10-24 23:58 ` Jeff King
2018-10-25 4:09 ` Junio C Hamano
2018-10-19 16:12 ` [PATCH v2 0/3] speed up git reset Ben Peart
2018-10-19 16:12 ` [PATCH v2 1/3] reset: don't compute unstaged changes after reset when --quiet Ben Peart
2018-10-19 16:12 ` [PATCH v2 2/3] reset: add new reset.quiet config setting Ben Peart
2018-10-19 16:36 ` Eric Sunshine
2018-10-19 16:46 ` Jeff King
2018-10-19 17:10 ` Eric Sunshine
2018-10-19 17:11 ` Jeff King
2018-10-19 17:23 ` Ben Peart
2018-10-19 19:08 ` Jeff King
2018-10-22 5:04 ` Junio C Hamano
2018-10-19 17:11 ` Ben Peart
2018-10-19 16:12 ` [PATCH v2 3/3] reset: warn when refresh_index() takes more than 2 seconds Ben Peart
2018-10-22 13:18 ` [PATCH v3 0/3] speed up git reset Ben Peart
2018-10-22 13:18 ` [PATCH v3 1/3] reset: don't compute unstaged changes after reset when --quiet Ben Peart
2018-10-22 20:44 ` Johannes Schindelin
2018-10-22 22:07 ` Ben Peart
2018-10-23 8:53 ` Johannes Schindelin
2018-10-23 15:46 ` Duy Nguyen
2018-10-23 19:55 ` Johannes Schindelin
2018-10-22 13:18 ` [PATCH v3 2/3] reset: add new reset.quiet config setting Ben Peart
2018-10-22 14:45 ` Duy Nguyen
2018-10-23 18:47 ` Ben Peart
2018-10-24 2:56 ` Junio C Hamano
2018-10-24 7:21 ` Junio C Hamano
2018-10-24 14:54 ` Duy Nguyen
2018-10-25 1:12 ` Junio C Hamano [this message]
2018-10-24 14:49 ` Duy Nguyen
2018-10-22 19:13 ` Ramsay Jones
2018-10-22 20:06 ` Jeff King
2018-10-23 17:31 ` Ben Peart
2018-10-23 17:35 ` Jeff King
2018-10-22 13:18 ` [PATCH v3 3/3] reset: warn when refresh_index() takes more than 2 seconds Ben Peart
2018-10-23 0:23 ` Junio C Hamano
2018-10-23 17:12 ` Ben Peart
2018-10-23 19:04 ` [PATCH v4 0/3] speed up git reset Ben Peart
2018-10-23 19:04 ` [PATCH v4 1/3] reset: don't compute unstaged changes after reset when --quiet Ben Peart
2018-10-23 19:04 ` [PATCH v4 2/3] reset: add new reset.quiet config setting Ben Peart
2018-10-24 0:39 ` Ramsay Jones
2018-10-25 4:56 ` Junio C Hamano
2018-10-25 9:26 ` Junio C Hamano
2018-10-25 13:26 ` Ben Peart
2018-10-25 17:04 ` Ramsay Jones
2018-10-23 19:04 ` [PATCH v4 3/3] reset: warn when refresh_index() takes more than 2 seconds Ben Peart
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=xmqqa7n2n81a.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=benpeart@microsoft.com \
--cc=git@vger.kernel.org \
--cc=pclouds@gmail.com \
--cc=peartben@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).