From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Stephen J. Turnbull" Newsgroups: gmane.emacs.devel Subject: Re: Stash Date: Mon, 06 Apr 2015 05:18:26 +0900 Message-ID: <87d23ifhwt.fsf@uwakimon.sk.tsukuba.ac.jp> References: <55218191.1060602@cs.ucla.edu> <86oan274wg.fsf@dod.no> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 X-Trace: ger.gmane.org 1428265127 5376 80.91.229.3 (5 Apr 2015 20:18:47 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 5 Apr 2015 20:18:47 +0000 (UTC) Cc: emacs-devel@gnu.org To: Steinar Bang Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 05 22:18:38 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 1Yer08-0005tE-Oa for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 22:18:36 +0200 Original-Received: from localhost ([::1]:37529 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yer08-0003qq-0y for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 16:18:36 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57936) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yer04-0003qa-Sk for emacs-devel@gnu.org; Sun, 05 Apr 2015 16:18:33 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yer00-00016N-Qn for emacs-devel@gnu.org; Sun, 05 Apr 2015 16:18:32 -0400 Original-Received: from shako.sk.tsukuba.ac.jp ([130.158.97.161]:33435) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yer00-00016J-Gn for emacs-devel@gnu.org; Sun, 05 Apr 2015 16:18:28 -0400 Original-Received: from uwakimon.sk.tsukuba.ac.jp (uwakimon.sk.tsukuba.ac.jp [130.158.99.156]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by shako.sk.tsukuba.ac.jp (Postfix) with ESMTPS id 561C61C388B; Mon, 6 Apr 2015 05:18:26 +0900 (JST) Original-Received: by uwakimon.sk.tsukuba.ac.jp (Postfix, from userid 1000) id 2CE1F120EC9; Mon, 6 Apr 2015 05:18:26 +0900 (JST) In-Reply-To: <86oan274wg.fsf@dod.no> X-Mailer: VM undefined under 21.5 (beta34) "kale" 83e5c3cd6be6 XEmacs Lucid (x86_64-unknown-linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 130.158.97.161 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:184979 Archived-At: Steinar Bang writes: > 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...? Adding git config branch.master.remote $URL_TO_SAVANNAH to Paul's instructions should do the trick.