From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 29064 invoked by alias); 19 Mar 2011 23:31:28 -0000 Mailing-List: contact archer-help@sourceware.org; run by ezmlm Sender: Precedence: bulk List-Post: List-Help: List-Subscribe: List-Id: Received: (qmail 29053 invoked by uid 22791); 19 Mar 2011 23:31:27 -0000 X-SWARE-Spam-Status: No, hits=-2.0 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: sourceware.org Date: Sat, 19 Mar 2011 23:31:00 -0000 From: Joel Brobecker To: Jan Kratochvil Cc: Pierre Muller , archer@sourceware.org Subject: Re: [Archer] Re: Apologies for wrong commit error Message-ID: <20110319233114.GD2534@adacore.com> References: <006b01cbe67d$7f308da0$7d91a8e0$@muller@ics-cnrs.unistra.fr> <20110319214549.GA4744@host1.jankratochvil.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20110319214549.GA4744@host1.jankratochvil.net> User-Agent: Mutt/1.5.20 (2009-06-14) X-SW-Source: 2011-q1/txt/msg00131.txt.bz2 > 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 % git push origin master This should restore the history to what it was prior to accidental commit. -- Joel