From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ug-out-1314.google.com (ug-out-1314.google.com [66.249.92.169]) by ozlabs.org (Postfix) with ESMTP id 4C4B467B8B for ; Tue, 5 Dec 2006 18:49:06 +1100 (EST) Received: by ug-out-1314.google.com with SMTP id k3so2906239ugf for ; Mon, 04 Dec 2006 23:49:05 -0800 (PST) Message-ID: <528646bc0612042349t34662037nc641c8e6e2516a09@mail.gmail.com> Date: Tue, 5 Dec 2006 00:49:04 -0700 From: "Grant Likely" Sender: glikely@gmail.com To: "Geert Uytterhoeven" Subject: Re: master branch reset In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed References: <17780.2568.641734.276805@cargo.ozlabs.ibm.com> Cc: linuxppc-dev@ozlabs.org, Paul Mackerras List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On 12/5/06, Geert Uytterhoeven wrote: > On Mon, 4 Dec 2006, Paul Mackerras wrote: > Any clues? Delete and reclone? Because Paul had to redo his tree; you're no longer able to 'pull' his changes into your branch. If you've got changes that you need to preserve; then you need to either generate a diff between Paul's old HEAD and your HEAD; then apply that to a new branch based of Paul's new HEAD. Or; you can create a new branch based on the new HEAD and 'git-cherry-pick' your changes into it. Either way, it can be rather painful. Cheers, g. -- Grant Likely, B.Sc. P.Eng. Secret Lab Technologies Ltd. grant.likely@secretlab.ca (403) 399-0195