From mboxrd@z Thu Jan 1 00:00:00 1970 From: Howard Miller Subject: Re: Commited to wrong branch Date: Tue, 15 Sep 2009 14:12:15 +0100 Message-ID: <26ae428a0909150612i3a24c968h33757594f16995a8@mail.gmail.com> References: <26ae428a0909150331q391ed39ak622902d175b46d84@mail.gmail.com> <46a038f90909150355h20b39c71w4af7e2be2920fdbb@mail.gmail.com> <26ae428a0909150405v3087016fxee5ac98057868677@mail.gmail.com> <46a038f90909150416h60ea7d74xd2337fe50f603dcb@mail.gmail.com> <26ae428a0909150510n56b1d4eg6565a6cca8c9b46c@mail.gmail.com> <46a038f90909150546i508d3781id1dcd8e6c64942cf@mail.gmail.com> <26ae428a0909150558i508e5878q8a1ee7cb7311fc57@mail.gmail.com> <20090915130640.GC31846@atjola.homenet> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Martin Langhoff , git@vger.kernel.org To: =?ISO-8859-1?Q?Bj=F6rn_Steinbrink?= X-From: git-owner@vger.kernel.org Tue Sep 15 15:12:28 2009 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1MnXpZ-0005fQ-Ib for gcvg-git-2@lo.gmane.org; Tue, 15 Sep 2009 15:12:25 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753490AbZIONMR convert rfc822-to-quoted-printable (ORCPT ); Tue, 15 Sep 2009 09:12:17 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753390AbZIONMQ (ORCPT ); Tue, 15 Sep 2009 09:12:16 -0400 Received: from mail-ew0-f206.google.com ([209.85.219.206]:46973 "EHLO mail-ew0-f206.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753051AbZIONMP convert rfc822-to-8bit (ORCPT ); Tue, 15 Sep 2009 09:12:15 -0400 Received: by ewy2 with SMTP id 2so441585ewy.17 for ; Tue, 15 Sep 2009 06:12:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:mime-version:sender:received:in-reply-to :references:date:x-google-sender-auth:message-id:subject:from:to:cc :content-type:content-transfer-encoding; bh=/0/vcRboneh+evbYWFb1kwe0hr7mScrpm2RGsNLbgDM=; b=KHnHUOgBILReSXfkoiXdSyWO0xClctUiYjufxdBR0fRncusMeBzlzQuUasJCjXHvLD P2PtqzsatJIV4gT9fUXSypAHZh6Ulm/2yKMgx7BevUywO9CxS4c/Q11QuJHuOkISSOY9 lCQqzcNK84bdgo28jXZIkEgl7UX/7qhaP9PvE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; b=o5TKOCYISGmQ1c1x4vbirBl4tvBl1jcb1W13UjAhRQqTtklwbY5VsFW5VYeTs/DdCo nnyAF2ak8MXPy8TtU3C3ZidVpWwX+0UxXFWXbW7WbKHJZxCXgJfZ4EeciebukLt9lndN Z61F0witM/PWQkAgEeRnGvYn6oW5B6mSJv718= Received: by 10.216.87.66 with SMTP id x44mr1911305wee.96.1253020335506; Tue, 15 Sep 2009 06:12:15 -0700 (PDT) In-Reply-To: <20090915130640.GC31846@atjola.homenet> X-Google-Sender-Auth: 0aec62316d712baf Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Please stop what? Ok... thanks for all your help guys but I'm giving up. A silly mistake has wasted a day. It shouldn't be like that. I appreciate that it's me that doesn't know enough about the way git works but I don't want to know. I don't have time - I have actual work to do. It'll be quicker to recreate the code I have lost. Git encourages one to be experimental and create branches and stuff all the time which is great but doesn't do enough to stop one getting completely confused. That's how it feels to me anyway. Yes I am in a sulk - sorry :-) Howard 2009/9/15 Bj=F6rn Steinbrink : > [Please stop top-posting...] > > On 2009.09.15 13:58:32 +0100, Howard Miller wrote: >> Got as far as applying the temporary patch and I now get a load of..= =2E >> >> Reversed (or previously applied) patch detected! =A0Assume -R? [n] >> Apply anyway? [n] >> Skipping patch. >> 1 out of 1 hunk ignored -- saving rejects to file >> theme/onepointnine/local.css.rej >> The next patch would create the file theme/onepointnine/local.css, > > Just don't use patch(1), there's no sane reason to do that, you're > sacrificing all of what git can offer there. > > cherry-pick or format-patch + am -3 are simply much better. (Or > "checkout -m" or stash + stash apply, if you're dealing with uncommit= ted > changes). > > Bj=F6rn > -- > To unsubscribe from this list: send the line "unsubscribe git" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at =A0http://vger.kernel.org/majordomo-info.html >