From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Steinar Bang Newsgroups: gmane.emacs.devel Subject: Re: Stash Date: Sun, 05 Apr 2015 21:26:39 +0200 Organization: Probably a good idea Message-ID: <86oan274wg.fsf@dod.no> References: <55218191.1060602@cs.ucla.edu> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1428262014 23242 80.91.229.3 (5 Apr 2015 19:26:54 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 5 Apr 2015 19:26:54 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 05 21:26:42 2015 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 1YeqBu-0005Va-0s for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 21:26:42 +0200 Original-Received: from localhost ([::1]:37392 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeqBt-0002Yr-6R for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 15:26:41 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49880) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeqBg-0002V0-4L for emacs-devel@gnu.org; Sun, 05 Apr 2015 15:26:28 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YeqBc-0002jB-4I for emacs-devel@gnu.org; Sun, 05 Apr 2015 15:26:28 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:46196) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeqBb-0002it-UL for emacs-devel@gnu.org; Sun, 05 Apr 2015 15:26:24 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1YeqBZ-0005Hj-Ri for emacs-devel@gnu.org; Sun, 05 Apr 2015 21:26:21 +0200 Original-Received: from cm-84.208.248.210.getinternet.no ([84.208.248.210]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 05 Apr 2015 21:26:21 +0200 Original-Received: from sb by cm-84.208.248.210.getinternet.no with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 05 Apr 2015 21:26:21 +0200 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 16 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: cm-84.208.248.210.getinternet.no Mail-Copies-To: never User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/24.4 (windows-nt) Cancel-Lock: sha1:sSH3vcmWy1KX+EiItW7wvzoxAxo= 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:184971 Archived-At: >>>>> Paul Eggert : > If your working copy of the source is in /home/rms/src/emacs and it is > in the master branch, you can do this: > cd /home/rms/src > git clone emacs emacs-new > cd emacs-new > git branch -m master master-old > git branch --track master origin/master > git checkout master > git pull Note that the remote for emacs-new will be the local git repo "emacs", and not savannah, so I don't see what this buys you wrt. resolving conflicts...?