From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: martin rudalics Newsgroups: gmane.emacs.devel Subject: Re: need help adjusting workflow to git (or vice versa) Date: Thu, 13 Nov 2014 17:29:19 +0100 Message-ID: <5464DC5F.8070607@gmx.at> References: <87zjbvt8o3.fsf@rosalinde.fritz.box> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1415896189 5133 80.91.229.3 (13 Nov 2014 16:29:49 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 13 Nov 2014 16:29:49 +0000 (UTC) To: Stephen Berman , emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 13 17:29:43 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 1XoxHC-0004sh-DV for ged-emacs-devel@m.gmane.org; Thu, 13 Nov 2014 17:29:42 +0100 Original-Received: from localhost ([::1]:60884 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XoxHB-0006FN-VT for ged-emacs-devel@m.gmane.org; Thu, 13 Nov 2014 11:29:42 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52418) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XoxH1-000660-OY for emacs-devel@gnu.org; Thu, 13 Nov 2014 11:29:37 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XoxGv-0007b5-ON for emacs-devel@gnu.org; Thu, 13 Nov 2014 11:29:31 -0500 Original-Received: from mout.gmx.net ([212.227.15.15]:49468) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XoxGv-0007aJ-D7 for emacs-devel@gnu.org; Thu, 13 Nov 2014 11:29:25 -0500 Original-Received: from [91.113.3.148] ([91.113.3.148]) by mail.gmx.com (mrgmx001) with ESMTPSA (Nemesis) id 0Lm34j-1YOI9l0M0f-00ZjdD; Thu, 13 Nov 2014 17:29:24 +0100 In-Reply-To: <87zjbvt8o3.fsf@rosalinde.fritz.box> X-Provags-ID: V03:K0:v5cMhyXsIqbviuhz4WEtt7U+q1IbJOwpZUCge7y2bSFOYYN2gCP NyQsFUinMCavME5DxWOiVaNJ9lZ4YJcV69ZRTA6hUOn8umv9hLyB1TWk2/taDDHipBktlHt 323utlml2KVRduf+kXUj90MgeQUztuIC9bopI1xwX3pRjM9npS/lY/BlI+x01RXQVO1kJvz JFVIbGe/N1e4W3G+cM9JA== X-UI-Out-Filterresults: notjunk:1; X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 212.227.15.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:176950 Archived-At: > 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. martin