From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Sven Axelsson Newsgroups: gmane.emacs.devel Subject: Re: Switching from old git tree Date: Fri, 14 Nov 2014 13:35:17 +0100 Message-ID: References: <87ioiiotwx.fsf@fencepost.gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Trace: ger.gmane.org 1415968553 28222 80.91.229.3 (14 Nov 2014 12:35:53 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 14 Nov 2014 12:35:53 +0000 (UTC) Cc: emacs To: David Kastrup Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Nov 14 13:35:46 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XpG6L-0001gW-7C for ged-emacs-devel@m.gmane.org; Fri, 14 Nov 2014 13:35:45 +0100 Original-Received: from localhost ([::1]:36127 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpG6K-0002mE-R4 for ged-emacs-devel@m.gmane.org; Fri, 14 Nov 2014 07:35:44 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:42001) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpG5x-0002lH-OV for emacs-devel@gnu.org; Fri, 14 Nov 2014 07:35:22 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XpG5w-0001oY-JX for emacs-devel@gnu.org; Fri, 14 Nov 2014 07:35:21 -0500 Original-Received: from mail-vc0-x22f.google.com ([2607:f8b0:400c:c03::22f]:45600) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpG5u-0001nt-NM; Fri, 14 Nov 2014 07:35:18 -0500 Original-Received: by mail-vc0-f175.google.com with SMTP id hy10so794514vcb.34 for ; Fri, 14 Nov 2014 04:35:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=YrMB1XEAsyErjvp3rBhNHyuys63kHIjQA2u2loNr7O8=; b=cs3RVDko1waqIuixj6cyy9OgJ9XuJx/fBaytO9phJa3YLoSML7IQ3lrRfLEY7zrWDQ bLxfSJKhEiJNNw7xt5+dXvPg5rv0jsCj/jmkDpjSIoPoWwiL/Kvg1VKov1g/3FZJUa3N onjySKpdnXoJJyDl/s8jY5ZbLFpUWUYQjua2ehmrgpTGegd4rzXdC/zuOWtYZO6SRmu/ 6hJmqxjC+4tuyK0v36OzpWebWRG8E4hpmrGAwtdXXra80FsCQnwcTL/7iq51TV1RPrVM pHDyYncf0lTW++oEcWh2i0Sog9TwSVf00NJO+r+rP2XTWbHQCMJ7pS5A1B6K3yaI3r+O LmrA== X-Received: by 10.220.238.3 with SMTP id kq3mr6714011vcb.8.1415968518021; Fri, 14 Nov 2014 04:35:18 -0800 (PST) Original-Received: by 10.31.153.4 with HTTP; Fri, 14 Nov 2014 04:35:17 -0800 (PST) In-Reply-To: <87ioiiotwx.fsf@fencepost.gnu.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400c:c03::22f X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:177068 Archived-At: On 14 November 2014 13:20, David Kastrup wrote: > peder@news.klingenberg.no (Peder O. Klingenberg) writes: > >> I have been using the old git-mirror for a while. In there, I have a >> branch with some local modifications. >> >> I understand that I need to check out a fresh tree now after the >> conversion? What is the smoothest way of integrating my local branch in >> this new tree? I'm a very basic git user, and the only way I can think >> of is to extract the patches from my old branch and applying them by >> hand in the new tree. > > Using git format-patch and git am, rather than git diff and git apply. > >> Is there something else I should be doing instead? > > I don't think there is much of an option to do something else. I suppose you could add your old repo as a local remote to the new one, and cherry-pick your commits, i.e.: git remote add old /local/path/to/old # Fetch the data to your new repo git fetch old # Find the commits to pick somehow git log old/master # Copy to new repo git cherry-pick -- Sven Axelsson ++++++++++[>++++++++++>+++++++++++>++++++++++>++++++ >++++<<<<<-]>++++.+.++++.>+++++.>+.<<-.>>+.>++++.<<. +++.>-.<<++.>>----.<++.>>>++++++.<<<<.>>++++.<----.