From: "Boyd Stephen Smith Jr." <bss@iguanasuicide.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Robin Rosenberg <robin.rosenberg.lists@dewire.com>, git@vger.kernel.org
Subject: Re: [PATCH] Make git revert warn the user when reverting a merge commit.
Date: Sat, 20 Dec 2008 21:11:13 -0600 [thread overview]
Message-ID: <200812202111.17831.bss@iguanasuicide.net> (raw)
In-Reply-To: <7viqpetfs3.fsf@gitster.siamese.dyndns.org>
[-- Attachment #1: Type: text/plain, Size: 729 bytes --]
On Saturday 2008 December 20 20:37:16 Junio C Hamano wrote:
> Robin Rosenberg <robin.rosenberg.lists@dewire.com> writes:
> > An alternative, would be "removing changes relative to .."
> > (mainline).
>
> But that is exactly what "This reverts commit X" means, isn't it?
When X is a merge commit, the phrase "the reverts commit X" is ambiguous. Did
you revert the tree to X^, X^2, or X^8? I'd be fine with "This reverts
commit X to X^y", but we definitely need some mention of X^y.
--
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-21 3:12 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-19 2:39 [PATCH] Make git revert warn the user when reverting a merge commit Boyd Stephen Smith Jr.
2008-12-19 2:57 ` Johannes Schindelin
2008-12-19 3:03 ` Junio C Hamano
2008-12-19 3:29 ` Boyd Stephen Smith Jr.
2008-12-19 3:55 ` Jay Soffian
2008-12-19 5:54 ` Boyd Stephen Smith Jr.
2008-12-19 6:35 ` Junio C Hamano
2008-12-19 18:07 ` Alan
2008-12-19 3:24 ` Boyd Stephen Smith Jr.
2008-12-20 7:08 ` Robin Rosenberg
2008-12-20 22:54 ` Boyd Stephen Smith Jr.
2008-12-20 23:31 ` Robin Rosenberg
2008-12-21 2:37 ` Junio C Hamano
2008-12-21 3:11 ` Boyd Stephen Smith Jr. [this message]
2008-12-21 10:09 ` Robin Rosenberg
2008-12-21 10:59 ` Junio C Hamano
2008-12-21 19:59 ` Boyd Stephen Smith Jr.
2008-12-21 20:23 ` Junio C Hamano
2008-12-21 21:13 ` Boyd Stephen Smith Jr.
2008-12-21 22:17 ` Junio C Hamano
2008-12-21 22:38 ` Junio C Hamano
2008-12-21 22:40 ` Robin Rosenberg
2008-12-21 22:46 ` Junio C Hamano
2008-12-21 22:56 ` Robin Rosenberg
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=200812202111.17831.bss@iguanasuicide.net \
--to=bss@iguanasuicide.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=robin.rosenberg.lists@dewire.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 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.