From: "Boyd Stephen Smith Jr." <bss@iguanasuicide.net>
To: git@vger.kernel.org
Cc: Nanako Shiraishi <nanako3@lavabit.com>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] Add a documentat on how to revert a faulty merge
Date: Sat, 20 Dec 2008 16:12:33 -0600 [thread overview]
Message-ID: <200812201612.37455.bss@iguanasuicide.net> (raw)
In-Reply-To: <20081220202702.6117@nanako3.lavabit.com>
[-- Attachment #1: Type: text/plain, Size: 1708 bytes --]
On Saturday 2008 December 20 05:27:02 Nanako Shiraishi wrote:
> +Date: Fri, 19 Dec 2008 00:45:19 -0800
> +From: Linus Torvalds <torvalds@linux-foundation.org>, Junio C Hamano
> <gitster@pobox.com> +Subject: Re: Odd merge behaviour involving reverts
> +Abstract: Sometimes a branch that was already merged to the mainline
> + is later found to be faulty. Linus and Junio give guidance on
> + recovering from such a premature merge and continuing development
> + after the offending branch is fixed.
> +Message-ID: <7vocz8a6zk.fsf@gitster.siamese.dyndns.org>
> +References: <alpine.LFD.2.00.0812181949450.14014@localhost.localdomain>
> +
> +Alan <alan@clueserver.org> said:
I don't like the email headers as part of the documentation. It would be
better to have a title and abstract in prose.
Also, your email gave me some errors from 'git am':
.dotest/patch:40: indent with spaces.
/
.dotest/patch:57: indent with spaces.
/
.dotest/patch:91: indent with spaces.
/
.dotest/patch:103: indent with spaces.
/
.dotest/patch:110: indent with spaces.
/ /
warning: squelched 3 whitespace errors
warning: 8 lines add whitespace errors.
Those errors aside, I think it's better formatted than what I had ready. I
also think it would be nice to also modify the git-revert manpage to
reference this documentation in the description on the -m option.
--
Boyd Stephen Smith Jr. ,= ,-_-. =.
bss@iguanasuicide.net ((_/)o o(\_))
ICQ: 514984 YM/AIM: DaTwinkDaddy `-'(. .)`-'
http://iguanasuicide.net/ \_/
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 197 bytes --]
next prev parent reply other threads:[~2008-12-20 22:13 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-20 11:27 [PATCH] Add a documentat on how to revert a faulty merge Nanako Shiraishi
2008-12-20 22:12 ` Boyd Stephen Smith Jr. [this message]
2008-12-21 2:37 ` 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=200812201612.37455.bss@iguanasuicide.net \
--to=bss@iguanasuicide.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=nanako3@lavabit.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).