From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Lars Magne Ingebrigtsen Newsgroups: gmane.emacs.devel Subject: Re: A simple git workflow for the rest of us Date: Sun, 16 Nov 2014 15:42:49 +0100 Message-ID: References: <87y4rc9rhj.fsf@igel.home> <87r3x3usd8.fsf@engster.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1416149025 21401 80.91.229.3 (16 Nov 2014 14:43:45 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 16 Nov 2014 14:43:45 +0000 (UTC) Cc: Andreas Schwab , emacs-devel@gnu.org To: David Engster Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Nov 16 15:43:37 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 1Xq13A-0002I2-S8 for ged-emacs-devel@m.gmane.org; Sun, 16 Nov 2014 15:43:37 +0100 Original-Received: from localhost ([::1]:43998 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xq13A-0006zB-Gb for ged-emacs-devel@m.gmane.org; Sun, 16 Nov 2014 09:43:36 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34659) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xq12n-0006nU-Ar for emacs-devel@gnu.org; Sun, 16 Nov 2014 09:43:18 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xq12h-0007RV-Jt for emacs-devel@gnu.org; Sun, 16 Nov 2014 09:43:13 -0500 Original-Received: from hermes.netfonds.no ([80.91.224.195]:58965) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xq12h-0007RG-Dm for emacs-devel@gnu.org; Sun, 16 Nov 2014 09:43:07 -0500 Original-Received: from cm-84.215.51.58.getinternet.no ([84.215.51.58] helo=stories.gnus.org) by hermes.netfonds.no with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1Xq12P-0003l1-IP; Sun, 16 Nov 2014 15:42:49 +0100 Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAJ1BMVEX+//kjFhj///240d7I 5/Tm8/b///6TqLj+/vn9/ff///9ia3j+//bvqvdYAAACUklEQVQ4jXXUz2vTYBgH8IeAYCGXlyIy dgnPNKbFgy7VTHpsxxAvaqmjHgN70XhyccQZTztpTzrpZrpbx170vcUdgsRD2clB/iift+mPdK3f Q6DvJ8/z/mgSYP8JBOOk84nBD+xglnAq4Pu2b1OcKwLqfjtP3nLcFGo126k1GzkkQXhuHDv1pN6G WjNPo2EHG3bgP9Xwu1HfN6A5jZ08t4JdRDxE6yXC5hS2NjiGHwbockTOC+D0pVjrDizrk2uaXgFs OYnw3FkrWpUsZApbQbBfBDmBd+1OdymE/blhKSbwZBEa9miO6jwMYHMr8NUmvHmQ0HQq22Hih+ls bqFuAntPip3qrXpSmKRXpTmch6Ob3EIrEb+niuCFvJozVuYIQ3MBTtlNNECrLoFVQ18Gbxhb1wGv bkDKr4z9oopFecbYyjL4GTNWBgL1o1uA49WYlREuFiq2v7D4Ny1XM18dmNwTfAKtx6tsHQmsTjTK UT4uej1argFDDaO5TqLTYmyXjuSiFx0JUZCeTfsgwI7TP92R7Sm8TgkMyP62/fWzb58Dc3yaokKw YkF2zfH31hwn9B/lMLhNcOMuZICRK39EVmtU4Q5wjV7NcoXgekRDHs83KiTeUUAVmhXRUy+563GP tsnxZAzDUoQmuiZdTNP1XON+XC4nJWpVijR6jWgc6Z3xENP4Tye8pAp1wuNw00SLIMsIsmwGKlYS fgR9BJpRBD1N78FwBEOgpwUQEOmK+tv0UFVEmWqmg4qhD+EyOznX0CiB+l48aFPUv5Kp2awDzt3K P5Bp+SDYwbPGAAAAAElFTkSuQmCC X-Now-Playing: Leila's _Like Weather_: "Blue Grace" X-Hashcash: 1:23:141116:schwab@linux-m68k.org::yNw0PwZR05ORmqCr:0000000000000000000000000000000000000000CRjE X-Hashcash: 1:23:141116:emacs-devel@gnu.org::PIzyFrfZSWNkCVzp:000000000000000000000000000000000000000000Lnbr X-Hashcash: 1:23:141116:deng@randomsample.de::jEo+0gXhVx9A8vci:00000000000000000000000000000000000000000jtUk In-Reply-To: <87r3x3usd8.fsf@engster.org> (David Engster's message of "Sun, 16 Nov 2014 15:34:11 +0100") User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.50 (gnu/linux) X-MailScanner-ID: 1Xq12P-0003l1-IP MailScanner-NULL-Check: 1416753769.95069@aTUR1rBkCWNfjEddFfWuMQ X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.224.195 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:177298 Archived-At: David Engster writes: > 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 I see; thanks. Is there a way to set this for the Emacs repository only, so that the simple git Emacs instructions doesn't affect what the developer might otherwise be working on? Or, since the default has changed now, is this something that basically everybody wants, so it really should be global? > 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. For the instructions, I'd rather have a recipe that works for everybody without installing newer git versions. My git version has "upstream" and "current" as possibilities... -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no