git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Rast <trast@student.ethz.ch>
To: Raman Gupta <rocketraman@fastmail.fm>
Cc: Nanako Shiraishi <nanako3@lavabit.com>, <git@vger.kernel.org>,
	<gitster@pobox.com>, <skillzero@gmail.com>
Subject: Re: [PATCHv3] Add branch management for releases to gitworkflows
Date: Wed, 18 Nov 2009 15:59:01 +0100	[thread overview]
Message-ID: <200911181559.02873.trast@student.ethz.ch> (raw)
In-Reply-To: <4B033D8F.1080309@fastmail.fm>

Raman Gupta wrote:
> 
> I *am* a native English speaker. Sadly, its the *only* language I
> speak, read, and write. However, additional comments would
> definitely be nice.

Oh, my apologies.  I just looked at the names and jumped to
conclusions from there.

> Agree. I reworded the sections to untangle the information
> somewhat. Let me know what you think.
[...]
>  * `git merge --ff-only master`
>  =====================================
>  
[...]
> +If the merge fails because it is not a fast-forward, then it is
> +possible some fixes on 'maint' were missed in the feature release.
> +This will not happen if the content of the branches was verified as
> +described in the previous section.

Yes, I think that is nicer.  It's no longer a repetition of what was
said above, but merely points out what could have gone wrong and where
to look for advice.  The last sentence sounds a bit like "ha ha we
told you so!" though ;-)

FWIW, you can add my

  Acked-by: Thomas Rast <trast@student.ethz.ch>

to the final (squashed) patch.

-- 
Thomas Rast
trast@{inf,student}.ethz.ch

  reply	other threads:[~2009-11-18 15:00 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-11-12 19:46 Add branch management for releases to gitworkflows rocketraman
2009-11-12 19:46 ` [PATCHv3] " rocketraman
2009-11-12 20:08   ` skillzero
2009-11-12 20:30     ` Raman Gupta
2009-11-13 22:19   ` Nanako Shiraishi
2009-11-13 22:56     ` Raman Gupta
2009-11-13 23:10       ` Nanako Shiraishi
2009-11-14  5:35         ` Raman Gupta
2009-11-14  8:59           ` Björn Gustavsson
2009-11-14  9:01           ` Nanako Shiraishi
2009-11-14 17:27             ` Raman Gupta
2009-11-15  9:14     ` Junio C Hamano
2009-11-15 17:07     ` Thomas Rast
2009-11-18  0:19       ` Raman Gupta
2009-11-18 14:59         ` Thomas Rast [this message]
2009-11-19  4:11           ` Nanako Shiraishi

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=200911181559.02873.trast@student.ethz.ch \
    --to=trast@student.ethz.ch \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=nanako3@lavabit.com \
    --cc=rocketraman@fastmail.fm \
    --cc=skillzero@gmail.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).