From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Achim Gratz Newsgroups: gmane.emacs.devel Subject: Re: A simple git workflow for the rest of us Date: Sun, 16 Nov 2014 15:36:52 +0100 Organization: Linux Private Site Message-ID: <87fvdjjjp7.fsf@Rainer.invalid> References: <87y4rc9rhj.fsf@igel.home> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: ger.gmane.org 1416148657 15690 80.91.229.3 (16 Nov 2014 14:37:37 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 16 Nov 2014 14:37:37 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Nov 16 15:37:31 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 1Xq0xH-0008F2-0f for ged-emacs-devel@m.gmane.org; Sun, 16 Nov 2014 15:37:31 +0100 Original-Received: from localhost ([::1]:43985 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xq0xG-0005DU-KE for ged-emacs-devel@m.gmane.org; Sun, 16 Nov 2014 09:37:30 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33585) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xq0wz-0005DO-2K for emacs-devel@gnu.org; Sun, 16 Nov 2014 09:37:19 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xq0ws-0005ko-Pn for emacs-devel@gnu.org; Sun, 16 Nov 2014 09:37:12 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:47772) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xq0ws-0005kk-Jg for emacs-devel@gnu.org; Sun, 16 Nov 2014 09:37:06 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Xq0wr-000874-0i for emacs-devel@gnu.org; Sun, 16 Nov 2014 15:37:05 +0100 Original-Received: from pd9eb3aa3.dip0.t-ipconnect.de ([217.235.58.163]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 16 Nov 2014 15:37:05 +0100 Original-Received: from Stromeko by pd9eb3aa3.dip0.t-ipconnect.de with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 16 Nov 2014 15:37:05 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 29 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: pd9eb3aa3.dip0.t-ipconnect.de User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4.51 (gnu/linux) Cancel-Lock: sha1:GhV32VbBGjR+yyc6Pgop0vInIu8= 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:177297 Archived-At: Lars Magne Ingebrigtsen writes: […] > And now the push. I see that I was mistaken last time -- it did > actually push my trunk change, but it's complaining about the emacs-24 > branch, where I have no changes and that I didn't want to push. > > So... is the hint it's giving the correct thing to do, or is there some > further configuration I should have done on the trunk to avoid these > messages? Consult the documentation on the push.default configuration (git help config), you don't want "matching" in a configuration that has permanent new-workdirs attached. > So "git pull" on the "new-workdir"'ed branch made pushing on the trunk > stop giving error messages. Which is kinda fun. The same would have happened if you had updated the emacs-24 branch in the master repository. Remember that the "new-workdir" really is working on your base repository. Regards, Achim. -- +<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+ Factory and User Sound Singles for Waldorf Blofeld: http://Synth.Stromeko.net/Downloads.html#WaldorfSounds