From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 19568 invoked by alias); 19 Mar 2011 23:40:51 -0000 Mailing-List: contact archer-help@sourceware.org; run by ezmlm Sender: Precedence: bulk List-Post: List-Help: List-Subscribe: List-Id: Received: (qmail 19559 invoked by uid 22791); 19 Mar 2011 23:40:50 -0000 X-SWARE-Spam-Status: No, hits=-1.2 required=5.0 tests=AWL,BAYES_00,MSGID_MULTIPLE_AT X-Spam-Check-By: sourceware.org From: "Pierre Muller" To: "'Jan Kratochvil'" , "'Joel Brobecker'" Cc: References: <006b01cbe67d$7f308da0$7d91a8e0$@muller@ics-cnrs.unistra.fr> <20110319214549.GA4744@host1.jankratochvil.net> In-Reply-To: <20110319214549.GA4744@host1.jankratochvil.net> Subject: RE: Apologies for wrong commit error Date: Sat, 19 Mar 2011 23:40:00 -0000 Message-ID: <007101cbe68f$043bf0a0$0cb3d1e0$@muller@ics-cnrs.unistra.fr> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable X-SW-Source: 2011-q1/txt/msg00132.txt.bz2 > -----Message d'origine----- > De=A0: archer@sourceware.org [mailto:archer@sourceware.org] De la part de > Jan Kratochvil > Envoy=E9=A0: samedi 19 mars 2011 22:46 > =C0=A0: Pierre Muller > Cc=A0: archer@sourceware.org > Objet=A0: Re: Apologies for wrong commit error >=20 > Hi Pierre, >=20 > 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? >=20 > It seems OK now to me. > git diff > cdf4dfaa567c4903b2fce0a16a2e5702e059932e..c40415cfe4d602ded27d296c77100 > 6609596d5f4 > shows no change. Thank you for the check, I got strange results when I tried to do the same... =20 > > Can an admin completely wipe my error out? >=20 > 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 This should be fixed now, after I committed my last local version back to the git remote server. At least,=20 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 > % git push origin master > >This should restore the history to what it was prior to accidental >commit. But this is what I was already unable to do on my own branch: I got this warning about wiping out history=20 and a suggestion about using=20 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, Pierre =20