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 20:43:10 +0100 Message-ID: References: <87sihkicso.fsf@Rainer.invalid> <87vbmfym7i.fsf@olgas.newt.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1416167036 7440 80.91.229.3 (16 Nov 2014 19:43:56 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 16 Nov 2014 19:43:56 +0000 (UTC) Cc: emacs-devel@gnu.org To: Bill Wohler Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Nov 16 20:43:50 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 1Xq5ji-0006uz-3W for ged-emacs-devel@m.gmane.org; Sun, 16 Nov 2014 20:43:50 +0100 Original-Received: from localhost ([::1]:44903 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xq5jh-0005Ut-Kq for ged-emacs-devel@m.gmane.org; Sun, 16 Nov 2014 14:43:49 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:53134) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xq5jZ-0005Un-PK for emacs-devel@gnu.org; Sun, 16 Nov 2014 14:43:47 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xq5jU-0008Nf-7L for emacs-devel@gnu.org; Sun, 16 Nov 2014 14:43:41 -0500 Original-Received: from hermes.netfonds.no ([80.91.224.195]:46154) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xq5jU-0008NK-11 for emacs-devel@gnu.org; Sun, 16 Nov 2014 14:43:36 -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 1Xq5j4-0006gQ-Go; Sun, 16 Nov 2014 20:43:10 +0100 Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAHlBMVEX8+0tST0PMxa3n4LP/ /zgICwt4dF6vqYY2Myz//zcLUGR4AAACR0lEQVQ4jXXUzW+bMBQAcC9C6XbbSxWL3jbQml0HUnP1 weqUYw5GHOdFGHpriYRzHJGI6L2qyn+79wwhS6o9JSTyj+dvmzHmyVV3Hi9SCuYxKbvLQGGewMcx pJSr4YsVSVkZDG3G2MTMZQjdnsfM2C/YhifgXOqZMRYrRuD+WIj/YG/ykuAngJ6rIdIaECyBRIBG jaJhliN4gjJAnQLBEjDvnoD7XNf+2n8H/k33avBTOCgDGuAUAF9Mu0KtG/XcaNgP8MEBlqb4fH4D uC6D8AgwPzRz3abNDUHQw0eAIlONatN16x/ewD/CzsFcJdTZdQswC4J4gKztx9A4+B2EDp4QVIpV KShUnRLEDjTBwzzJkleVZusRhAaTqVol2UOWdA1BiIDrrjkCRYuo/gUzgIvEQOlACG7M7gSHESYm DyI9Lgg32oHHJmVAYSuDsww8qo5whUvfGw4YI9Jl7GDa7wJAt06WgQMxPds7wI2NhgwNFxvOZUhG P8GiMifvYYJNRnHfcBRYi7vYVSUC7FJIPQpdl+I+vrOJ0VpzzvO+R7hDOXnLrNYGyzmg0wHA2hC+ fWZf6X2gYlwWf2NdRcvEY0/9gdG6QLheGq4Rdo+S3foNbXGcOtPW24rzfRzf/cGjhrO0sAZwM7R8 ExVFsY1ijevNgOaAhrLA6n9gbhze/aLDSSP125rnNNfI2zjMJcFVpYfZ7XPj6NZzIIUnGDUyxCF6 fOnBnfquw1RDR/SwWA0gT1fGC+kn/DPA5R1DV4mDd3cMpfwPxF+ramRvRalplgAAAABJRU5ErkJg gg== X-Now-Playing: Kraftwerk's _Computer World_: "It's More Fun To Compute" X-Hashcash: 1:23:141116:emacs-devel@gnu.org::5ZxDCE6qEmwRhyqO:000000000000000000000000000000000000000000Pn/c X-Hashcash: 1:23:141116:wohler@newt.com::krFgcNXTrx4i/AKw:00jy+1 In-Reply-To: <87vbmfym7i.fsf@olgas.newt.com> (Bill Wohler's message of "Sun, 16 Nov 2014 11:33:37 -0800") User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.50 (gnu/linux) X-MailScanner-ID: 1Xq5j4-0006gQ-Go MailScanner-NULL-Check: 1416771791.62326@DDz6hY0cxbfvict6IpO59Q 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:177353 Archived-At: Bill Wohler writes: > I'd second setting it globally to ensure that it happens universally to > avoid the spurious merge commits that otherwise ensue. > > Specifically, how does one make a configuration setting that applies to > everyone who clones the repository? Putting "push.default current" in there would be nice, too. (If this is possible.) -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no