From: "Pierre Muller" <pierre.muller@ics-cnrs.unistra.fr>
To: "'Joel Brobecker'" <brobecker@adacore.com>,
"'Jan Kratochvil'" <jan.kratochvil@redhat.com>
Cc: <archer@sourceware.org>
Subject: RE: [Archer] Re: Apologies for wrong commit error
Date: Sat, 19 Mar 2011 23:47:00 -0000 [thread overview]
Message-ID: <007401cbe68f$e7158490$b5408db0$@muller@ics-cnrs.unistra.fr> (raw)
In-Reply-To: <20110319233114.GD2534@adacore.com>
> 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.
As expected in my previous email, this is not possible:
Pierre@E6510-Muller ~/git/archer
$ git push --force origin master
Total 0 (delta 0), reused 0 (delta 0)
remote: error: denying non-fast-forward refs/heads/master (you should pull
first
)
To ssh://sourceware.org/git/archer.git
! [remote rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'ssh://sourceware.org/git/archer.git'
Thus my error is written in stone forever :(
Pierre
next prev parent reply other threads:[~2011-03-19 23:47 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 ` [Archer] " Joel Brobecker
2011-03-19 23:47 ` Pierre Muller [this message]
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:
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='007401cbe68f$e7158490$b5408db0$@muller@ics-cnrs.unistra.fr' \
--to=pierre.muller@ics-cnrs.unistra.fr \
--cc=archer@sourceware.org \
--cc=brobecker@adacore.com \
--cc=jan.kratochvil@redhat.com \
/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 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).