From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ted Zlatanov Newsgroups: gmane.emacs.devel Subject: Re: A simple git workflow for the rest of us Date: Sun, 16 Nov 2014 15:12:50 -0500 Organization: =?utf-8?B?0KLQtdC+0LTQvtGAINCX0LvQsNGC0LDQvdC+0LI=?= @ Cienfuegos Message-ID: <87ppcmlxa5.fsf@lifelogs.com> References: <87sihkicso.fsf@Rainer.invalid> <87vbmfym7i.fsf@olgas.newt.com> Reply-To: emacs-devel@gnu.org NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1416168778 1132 80.91.229.3 (16 Nov 2014 20:12:58 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 16 Nov 2014 20:12:58 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Nov 16 21:12:51 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 1Xq6Bn-0000Tz-Le for ged-emacs-devel@m.gmane.org; Sun, 16 Nov 2014 21:12:51 +0100 Original-Received: from localhost ([::1]:44980 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xq6Bn-0006wY-3B for ged-emacs-devel@m.gmane.org; Sun, 16 Nov 2014 15:12:51 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56593) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xq6Be-0006wQ-Go for emacs-devel@gnu.org; Sun, 16 Nov 2014 15:12:48 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xq6BY-0007NK-96 for emacs-devel@gnu.org; Sun, 16 Nov 2014 15:12:42 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:36993) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xq6BY-0007NG-2c for emacs-devel@gnu.org; Sun, 16 Nov 2014 15:12:36 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Xq6BW-0000Mi-9W for emacs-devel@gnu.org; Sun, 16 Nov 2014 21:12:34 +0100 Original-Received: from c-98-229-61-72.hsd1.ma.comcast.net ([98.229.61.72]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 16 Nov 2014 21:12:34 +0100 Original-Received: from tzz by c-98-229-61-72.hsd1.ma.comcast.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 16 Nov 2014 21:12:34 +0100 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 38 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: c-98-229-61-72.hsd1.ma.comcast.net X-Face: bd.DQ~'29fIs`T_%O%C\g%6jW)yi[zuz6; d4V0`@y-~$#3P_Ng{@m+e4o<4P'#(_GJQ%TT= D}[Ep*b!\e,fBZ'j_+#"Ps?s2!4H2-Y"sx" Mail-Copies-To: never User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.50 (gnu/linux) Cancel-Lock: sha1:/V7UGHtBk0ySLH/BljLa/DVoIYk= 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:177355 Archived-At: On Sun, 16 Nov 2014 20:43:10 +0100 Lars Magne Ingebrigtsen wrote: LMI> 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? LMI> Putting "push.default current" in there would be nice, too. (If this is LMI> possible.) It's not. Make a config file with the right settings and ask users to copy or merge it to `$checkout_path/.git/config' when they clone. For completeness, here's my .gitconfig that may be useful, though it doesn't have the pull.rebase=true that was mentioned or the git-merge-changelog driver. Ted #+begin_src text [core] whitespace = trailing-space,space-before-tab [diff] renames = copies algorithm = patience [merge] stat = true [grep] fullname = true [push] default = current #+end_src