public inbox for
 help / color / mirror / Atom feed
From: Joel Brobecker <>
To: Jan Kratochvil <>
Cc: Pierre Muller <>,
Subject: Re: [Archer] Re: Apologies for wrong commit error
Date: Sat, 19 Mar 2011 23:31:00 -0000	[thread overview]
Message-ID: <> (raw)
In-Reply-To: <>

> 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

You could undo the change by forcing the HEAD (reference) back to
the commit prior to the accidental one. I've never actually done
this before, but something like this, perhaps:

        % git reset --hard <SHA1>
        % git push origin master

This should restore the history to what it was prior to accidental


  reply	other threads:[~2011-03-19 23:31 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
2011-03-19 23:31   ` Joel Brobecker [this message]
2011-03-19 23:47     ` [Archer] " 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).