From: Junio C Hamano <gitster@pobox.com>
To: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Fix typos in the documentation.
Date: Thu, 27 Nov 2008 01:48:56 -0800 [thread overview]
Message-ID: <7vwsepa48n.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: 20081127073201.GD8267@ins.uni-bonn.de
Ralf Wildenhues <Ralf.Wildenhues@gmx.de> writes:
> Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
> ---
>
> This patch is against pu.
While I appreciate your fix, it would have been nicer to have at least
three patches in this case, organized like this:
* patch 1 applies to 'maint'. Let's call the result of such application
'maint plus fix';
In other words:
$ git checkout -b rw/maint-typofix maint
$ git am -s patch-1
* patch 2 is to be applied on top of the result of merging 'maint plus
fix' into 'master';
In other words:
$ git checkout -b rw/typofix master
$ git merge rw/maint-typofix
$ git am -s patch-2
* patch 3 is to contain everything else (it would be even nicer if they
are split up to apply to individual topic branches that are responsible
for introducing the typos, but I realize that it would be asking too
much).
In other words:
$ git checkout pu
$ git merge rw/typofix
$ git am -s patch-3
I've done the above splitting myself and further did:
$ git checkout maint
$ git merge rw/maint-typofix
$ git branch -d rw/maint-typofix
$ git checkout master
$ git merge rw/typofix
$ git branch -d rw/typofix
I did not create a single "patch-3" but squashed the fixes in to the
respective commits on the topic branches, as they are only on 'pu' and not
part of 'next' (hence I am free to amend and rebase them).
Thanks.
next prev parent reply other threads:[~2008-11-27 9:51 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-27 7:32 [PATCH] Fix typos in the documentation Ralf Wildenhues
2008-11-27 9:10 ` Andreas Ericsson
2008-11-27 21:16 ` Ralf Wildenhues
2008-11-27 9:48 ` Junio C Hamano [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-01-02 5:56 Ralf Wildenhues
2011-01-03 17:57 ` Drew Northup
2011-01-03 19:03 ` Ralf Wildenhues
2011-01-04 19:18 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vwsepa48n.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=Ralf.Wildenhues@gmx.de \
--cc=git@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.