From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 12742 invoked by alias); 19 Mar 2011 21:46:02 -0000 Mailing-List: contact archer-help@sourceware.org; run by ezmlm Sender: Precedence: bulk List-Post: List-Help: List-Subscribe: List-Id: Received: (qmail 12732 invoked by uid 22791); 19 Mar 2011 21:46:01 -0000 X-SWARE-Spam-Status: No, hits=-6.3 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_HI,SPF_HELO_PASS,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Date: Sat, 19 Mar 2011 21:46:00 -0000 From: Jan Kratochvil To: Pierre Muller Cc: archer@sourceware.org Subject: Re: Apologies for wrong commit error Message-ID: <20110319214549.GA4744@host1.jankratochvil.net> References: <006b01cbe67d$7f308da0$7d91a8e0$@muller@ics-cnrs.unistra.fr> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <006b01cbe67d$7f308da0$7d91a8e0$@muller@ics-cnrs.unistra.fr> User-Agent: Mutt/1.5.21 (2010-09-15) X-SW-Source: 2011-q1/txt/msg00130.txt.bz2 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 cdf4dfaa567c4903b2fce0a16a2e5702e059932e..c40415cfe4d602ded27d296c771006609596d5f4 shows no change. > Can an admin completely wipe my error out? 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 Regards, Jan