public inbox for
 help / color / mirror / Atom feed
From: Jan Kratochvil <>
To: Pierre Muller <>
Subject: Re: Apologies for wrong commit error
Date: Sat, 19 Mar 2011 21:46:00 -0000	[thread overview]
Message-ID: <> (raw)
In-Reply-To: <006b01cbe67d$7f308da0$7d91a8e0$>

Hi Pierre,

On Sat, 19 Mar 2011 22:34:58 +0100, Pierre Muller wrote:
>  Could someone with enough git knowledge 
> check that the second did exactly cancel the first wrong commit?

It seems OK now to me.
git diff cdf4dfaa567c4903b2fce0a16a2e5702e059932e..c40415cfe4d602ded27d296c771006609596d5f4
shows no change.

>   Can an admin completely wipe my error out?

AFAIK it should not affect operations with master.  It is now more a problem
for the archer-muller-windows-multi branch as AFAIK there is no way to do a
real undo of a GIT merge.  GIT will now still think the current version of
archer-muller-windows-multi is already present in master, therefore this
command now no longer shows what has changed on archer-muller-windows-multi
(even if master has more recent updates):
	git diff origin/master...origin/archer-muller-windows-multi


  reply	other threads:[~2011-03-19 21:46 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-03-19 21:35 Pierre Muller
2011-03-19 21:46 ` Jan Kratochvil [this message]
2011-03-19 23:31   ` [Archer] " Joel Brobecker
2011-03-19 23:47     ` Pierre Muller
2011-03-20  4:48       ` [Archer] " Joel Brobecker
2011-03-20 12:40         ` Pierre Muller
2011-03-19 23:40   ` Pierre Muller

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:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \

* 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 read-only IMAP folder(s) and NNTP newsgroup(s).