All of lore.kernel.org
 help / color / mirror / Atom feed
From: Nanako Shiraishi <nanako3@lavabit.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
	Alan <alan@clueserver.org>,
	git@vger.kernel.org
Subject: Re: Odd merge behaviour involving reverts
Date: Sat, 20 Dec 2008 08:12:38 +0900	[thread overview]
Message-ID: <20081220081238.6117@nanako3.lavabit.com> (raw)
In-Reply-To: <7vljub7oko.fsf@gitster.siamese.dyndns.org>

Quoting Junio C Hamano <gitster@pobox.com>:

> Nanako Shiraishi <nanako3@lavabit.com> writes:
>
>> I think your explanation will help people if we make it part of the
>> documentation.  Especially because two different cases need two
>> different recovery methods, and people need to learn which is which.
>
> Sure.  It needs copyediting to make it readable standalone by not
> mentioning "your misunderstanding", inlining "earlier Linus's suggestion",
> etc., though.
>
> Patches welcome ;-)

Okay, I'll send one later.

Thanks.
-- 
Nanako Shiraishi
http://ivory.ap.teacup.com/nanako3/

  reply	other threads:[~2008-12-19 23:16 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-12-18 23:25 Odd merge behaviour involving reverts Alan
2008-12-18 23:58 ` Linus Torvalds
2008-12-19  0:11   ` Alan
2008-12-19  0:21     ` Linus Torvalds
2008-12-19  0:35       ` Alan
2008-12-19  0:46         ` Linus Torvalds
2008-12-19  3:44   ` Nanako Shiraishi
2008-12-19  4:01     ` Linus Torvalds
2008-12-19  4:18       ` Jay Soffian
2008-12-19  4:23         ` Linus Torvalds
2008-12-19  5:24       ` Daniel Barkalow
2008-12-19  8:45     ` Junio C Hamano
2008-12-19 21:45       ` Nanako Shiraishi
2008-12-19 23:05         ` Junio C Hamano
2008-12-19 23:12           ` Nanako Shiraishi [this message]
2008-12-19 23:51             ` Junio C Hamano
2008-12-19  1:30 ` Boyd Stephen Smith Jr.

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=20081220081238.6117@nanako3.lavabit.com \
    --to=nanako3@lavabit.com \
    --cc=alan@clueserver.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=torvalds@linux-foundation.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.