From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Kastrup Newsgroups: gmane.emacs.devel Subject: Re: Switching from old git tree Date: Fri, 14 Nov 2014 13:20:30 +0100 Organization: Organization?!? Message-ID: <87ioiiotwx.fsf@fencepost.gnu.org> References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1415967679 13468 80.91.229.3 (14 Nov 2014 12:21:19 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 14 Nov 2014 12:21:19 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Nov 14 13:21:12 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 1XpFsF-0002gq-M8 for ged-emacs-devel@m.gmane.org; Fri, 14 Nov 2014 13:21:11 +0100 Original-Received: from localhost ([::1]:36090 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpFsF-00018x-3c for ged-emacs-devel@m.gmane.org; Fri, 14 Nov 2014 07:21:11 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39828) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpFru-00018j-3a for emacs-devel@gnu.org; Fri, 14 Nov 2014 07:20:55 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XpFro-00061n-7s for emacs-devel@gnu.org; Fri, 14 Nov 2014 07:20:50 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:55092) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpFro-00061h-0u for emacs-devel@gnu.org; Fri, 14 Nov 2014 07:20:44 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1XpFrm-0002TR-EA for emacs-devel@gnu.org; Fri, 14 Nov 2014 13:20:42 +0100 Original-Received: from x2f49dc7.dyn.telefonica.de ([2.244.157.199]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 14 Nov 2014 13:20:42 +0100 Original-Received: from dak by x2f49dc7.dyn.telefonica.de with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 14 Nov 2014 13:20:42 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 19 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: x2f49dc7.dyn.telefonica.de X-Face: 2FEFf>]>q>2iw=B6, xrUubRI>pR&Ml9=ao@P@i)L:\urd*t9M~y1^:+Y]'C0~{mAl`oQuAl \!3KEIp?*w`|bL5qr,H)LFO6Q=qx~iH4DN; i"; /yuIsqbLLCh/!U#X[S~(5eZ41to5f%E@'ELIi$t^ Vc\LWP@J5p^rst0+('>Er0=^1{]M9!p?&:\z]|;&=NP3AhB!B_bi^]Pfkw User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) Cancel-Lock: sha1:ThkZQqTSGsB7svg0zr6JqP6wmlM= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 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:177067 Archived-At: 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. -- David Kastrup