From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: need help adjusting workflow to git (or vice versa) Date: Thu, 13 Nov 2014 17:43:27 +0100 Message-ID: References: <87zjbvt8o3.fsf@rosalinde.fritz.box> <5464DC5F.8070607@gmx.at> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1415897033 20237 80.91.229.3 (13 Nov 2014 16:43:53 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 13 Nov 2014 16:43:53 +0000 (UTC) Cc: Stephen Berman , emacs-devel@gnu.org To: martin rudalics Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 13 17:43:47 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 1XoxUo-0005Rx-QG for ged-emacs-devel@m.gmane.org; Thu, 13 Nov 2014 17:43:46 +0100 Original-Received: from localhost ([::1]:60967 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XoxUo-0003qr-Bm for ged-emacs-devel@m.gmane.org; Thu, 13 Nov 2014 11:43:46 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56765) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XoxUb-0003qZ-8x for emacs-devel@gnu.org; Thu, 13 Nov 2014 11:43:34 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XoxUW-00042j-Fo for emacs-devel@gnu.org; Thu, 13 Nov 2014 11:43:33 -0500 Original-Received: from cantor2.suse.de ([195.135.220.15]:37339 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XoxUW-00042b-A0 for emacs-devel@gnu.org; Thu, 13 Nov 2014 11:43:28 -0500 Original-Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 6CB0FAD06; Thu, 13 Nov 2014 16:43:27 +0000 (UTC) X-Yow: The appreciation of the average visual graphisticator alone is worth the whole suaveness and decadence which abounds!! In-Reply-To: <5464DC5F.8070607@gmx.at> (martin rudalics's message of "Thu, 13 Nov 2014 17:29:19 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] X-Received-From: 195.135.220.15 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:176955 Archived-At: martin rudalics writes: >> So how can I (i) keep a >> pristine copy of trunk (master) and (ii) build with possibly some local >> changes but without all changes from the task branch? > > From what I understand from here > > http://lists.gnu.org/archive/html/emacs-devel/2014-01/msg00790.html > > and subsequent comments you have to make a spearate clone. You can also use git new-workdir (not yet part of the git core, a proper replacement is being worked on). Andreas. -- Andreas Schwab, SUSE Labs, schwab@suse.de GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different."