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:50:53 +0100 Message-ID: <87mw7rurle.fsf@engster.org> 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 1416149478 27969 80.91.229.3 (16 Nov 2014 14:51:18 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 16 Nov 2014 14:51:18 +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:51:12 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 1Xq1AV-0005FN-TO for ged-emacs-devel@m.gmane.org; Sun, 16 Nov 2014 15:51:12 +0100 Original-Received: from localhost ([::1]:44009 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xq1AV-0000z1-7u for ged-emacs-devel@m.gmane.org; Sun, 16 Nov 2014 09:51:11 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36182) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xq1AM-0000yl-HW for emacs-devel@gnu.org; Sun, 16 Nov 2014 09:51:08 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xq1AG-00018d-Gl for emacs-devel@gnu.org; Sun, 16 Nov 2014 09:51:02 -0500 Original-Received: from randomsample.de ([5.45.97.173]:34767) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xq1AG-00018T-Ar for emacs-devel@gnu.org; Sun, 16 Nov 2014 09:50:56 -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=sdpx0yYcm5M3Z+MxWzXf0NnVs182D2N0s4cUmCu5w1E=; b=s2TIDW6Gjjxetdwn4kv9v4+9kVY+abmlL0LLnJ2cHLFg+pdPS172yHYS3QMBWqHcBWFYHgHM+3UFsEZTdDADE6ZdpmqoNhfa+P29IG2T9af7Je2te2jWZHuTN6+jzlG4; 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 1Xq1AF-0003QX-JL; Sun, 16 Nov 2014 15:50:55 +0100 In-Reply-To: (Lars Magne Ingebrigtsen's message of "Sun, 16 Nov 2014 15:42:49 +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:177300 Archived-At: Lars Magne Ingebrigtsen writes: > 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? Simply omit the '--global' and do it in the Emacs repo. > Or, since the default has changed now, is this something that > basically everybody wants, so it really should be global? The experts who happen to like 'matching' won't read your instructions anyway. ;-) But yes, I guess doing it local is better. -David