This is the mail archive of the
mailing list for the Archer project.
RE: Apologies for wrong commit error
- From: "Pierre Muller" <pierre dot muller at ics-cnrs dot unistra dot fr>
- To: "'Jan Kratochvil'" <jan dot kratochvil at redhat dot com>, "'Joel Brobecker'" <brobecker at adacore dot com>
- Cc: <archer at sourceware dot org>
- Date: Sun, 20 Mar 2011 00:40:21 +0100
- Subject: RE: Apologies for wrong commit error
- References: <006b01cbe67d$7f308da0$7d91a8e0$@firstname.lastname@example.org> <20110319214549.GA4744@host1.jankratochvil.net>
> -----Message d'origine-----
> De?: email@example.com [mailto:firstname.lastname@example.org] De la part de
> Jan Kratochvil
> Envoyé?: samedi 19 mars 2011 22:46
> À?: Pierre Muller
> Cc?: email@example.com
> Objet?: Re: Apologies for wrong commit error
> 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
> shows no change.
Thank you for the check,
I got strange results when I tried to do the same...
> > Can an admin completely wipe my error out?
> AFAIK it should not affect operations with master. It is now more a
> 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
> archer-muller-windows-multi is already present in master, therefore
> command now no longer shows what has changed on archer-muller-windows-
> (even if master has more recent updates):
> git diff origin/master...origin/archer-muller-windows-multi
This should be fixed now,
after I committed my last local version back to the git remote server.
git diff origin/master...origin/archer-muller-windows-multi
seems to give back the local changes...
> From Joel:
>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
But this is what I was already unable to do on my own branch:
I got this warning about wiping out history
and a suggestion about using
git push --force
but when I tried it out with --force option,
it did not work. It seems to be a git remote configuration
option to disable the possibility of such pushes.
Thanks to both of you,