This is the mail archive of the
archer@sourceware.org
mailing list for the Archer project.
Re: [Archer] Re: Apologies for wrong commit error
- From: Joel Brobecker <brobecker at adacore dot com>
- To: Jan Kratochvil <jan dot kratochvil at redhat dot com>
- Cc: Pierre Muller <pierre dot muller at ics-cnrs dot unistra dot fr>,archer at sourceware dot org
- Date: Sat, 19 Mar 2011 16:31:14 -0700
- Subject: Re: [Archer] Re: Apologies for wrong commit error
- References: <006b01cbe67d$7f308da0$7d91a8e0$@muller@ics-cnrs.unistra.fr><20110319214549.GA4744@host1.jankratochvil.net>
> 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
commit.
--
Joel