git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Eric Sunshine <sunshine@sunshineco.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH] update how-to-maintain-git
Date: Fri, 6 Mar 2020 14:06:47 -0500	[thread overview]
Message-ID: <CAPig+cStRc2hTmRBEfyaqhyx=M5nQ84rPzOEMVVLabQ2PS_Qzw@mail.gmail.com> (raw)
In-Reply-To: <xmqqzhct2y91.fsf_-_@gitster-ct.c.googlers.com>

On Fri, Mar 6, 2020 at 12:24 PM Junio C Hamano <gitster@pobox.com> wrote:
> +   Whether it is the initial round or a subsequent round, the topic
> +   may not build even in isolation, or may break the build when
> +   merged to integration branches due to bugs.  There may already be
> +   an obvious and trivial improvements suggested on the list.  The

s/an//

> +   maintainer often adds an extra commit, with "SQUASH???" in its
> +   title, to fix things up, before publishing the integration
> +   branches to make it usable by other developers for testing.
> +   These changes are what the maintainer is not 100% committed to
> +   (trivial typofixes etc. are often squashed directly into the
> +   patches that needs fixing, without being applied as a separate

s/needs/need/

> +   "SQUASH???" commit), so that they can be removed easily as needed.

  reply	other threads:[~2020-03-06 19:07 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-03 22:21 What's cooking in git.git (Mar 2020, #01; Tue, 3) Junio C Hamano
2020-03-03 23:05 ` Taylor Blau
2020-03-03 23:12   ` Junio C Hamano
2020-03-03 23:19     ` Junio C Hamano
2020-03-03 23:28       ` Taylor Blau
2020-03-04  3:31 ` Heba Waly
2020-03-04 15:30   ` Jonathan Tan
2020-03-04 16:18   ` Junio C Hamano
2020-03-05 15:17     ` Heba Waly
2020-03-06 17:23       ` [PATCH] update how-to-maintain-git Junio C Hamano
2020-03-06 19:06         ` Eric Sunshine [this message]
2020-03-06 21:28           ` Junio C Hamano
2020-03-07 12:16         ` Martin Ågren
2020-03-04 20:40 ` hv/receive-denycurrent-everywhere, was Re: What's cooking in git.git (Mar 2020, #01; Tue, 3) Johannes Schindelin
2020-03-04 21:27   ` Junio C Hamano

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAPig+cStRc2hTmRBEfyaqhyx=M5nQ84rPzOEMVVLabQ2PS_Qzw@mail.gmail.com' \
    --to=sunshine@sunshineco.com \
    --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. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).