From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Engster Newsgroups: gmane.emacs.devel Subject: Re: A simple git workflow for the rest of us Date: Sun, 16 Nov 2014 15:34:11 +0100 Message-ID: <87r3x3usd8.fsf@engster.org> References: <87y4rc9rhj.fsf@igel.home> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1416148515 13472 80.91.229.3 (16 Nov 2014 14:35:15 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 16 Nov 2014 14:35:15 +0000 (UTC) Cc: Andreas Schwab , emacs-devel@gnu.org To: Lars Magne Ingebrigtsen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Nov 16 15:35:08 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 1Xq0uw-0007Jq-Kl for ged-emacs-devel@m.gmane.org; Sun, 16 Nov 2014 15:35:06 +0100 Original-Received: from localhost ([::1]:43977 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xq0uw-0004Cr-5M for ged-emacs-devel@m.gmane.org; Sun, 16 Nov 2014 09:35:06 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:32818) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xq0uN-0003nK-D1 for emacs-devel@gnu.org; Sun, 16 Nov 2014 09:34:37 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xq0uH-0004i8-AS for emacs-devel@gnu.org; Sun, 16 Nov 2014 09:34:31 -0500 Original-Received: from randomsample.de ([5.45.97.173]:34735) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xq0uH-0004gr-1v for emacs-devel@gnu.org; Sun, 16 Nov 2014 09:34:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=randomsample.de; s=a; h=Content-Type:MIME-Version:Message-ID:Date:References:In-Reply-To:Subject:Cc:To:From; bh=yvAWsw1O933Mvd3pFq17Nxu8ptMTg+WTHn/14Ac0hn4=; b=ROti+EUUmJaA8dC0Q7E+qyFw9JTQRhiEqqSTbTLsPCMzW5cyxV03GBYui/DpArYzQXDN3J447jEpczSM+ND4MQJD5Jk4jTyY28g6yoMBQKVJDJ+d30DH2T6aXMy0OO0d; Original-Received: from ip2504b377.dynamic.kabel-deutschland.de ([37.4.179.119] helo=spaten) by randomsample.de with esmtpsa (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1Xq0u8-0003GY-WD; Sun, 16 Nov 2014 15:34:17 +0100 In-Reply-To: (Lars Magne Ingebrigtsen's message of "Sun, 16 Nov 2014 15:13:40 +0100") User-Agent: Gnus/5.13001 (Ma Gnus v0.10) Emacs/24.3.91 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 5.45.97.173 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:177296 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. That's the (horrible) default behavior of 'git push': it tries to update all matching branches. This makes it incredibly easy to update branches by accident, which in your case didn't work because your emacs-24 branch was behind. I strongly suggest to change the default to something like 'simple', which will only update the current branch to the corresponding upstream branch with the same name. This was also made the new default in Git 2.x (way too late, but at least they changed it). You can set this globally by doing git config --global push.default simple Note that 'simple' is only available since Git 1.7.11, and Debian stable still has 1.7.10. On older versions you can use 'upstream' or maybe 'current' (see 'git help config' to see the available options for 'push.default'), but I'd rather suggest to update Git from wheezy-backports. -David