From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Bill Wohler Newsgroups: gmane.emacs.devel Subject: Re: A simple git workflow for the rest of us Date: Sun, 16 Nov 2014 11:33:37 -0800 Organization: Newt Software Message-ID: <87vbmfym7i.fsf@olgas.newt.com> References: <87sihkicso.fsf@Rainer.invalid> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1416166451 31391 80.91.229.3 (16 Nov 2014 19:34:11 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 16 Nov 2014 19:34:11 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Nov 16 20:34:04 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 1Xq5aG-0003RJ-9X for ged-emacs-devel@m.gmane.org; Sun, 16 Nov 2014 20:34:04 +0100 Original-Received: from localhost ([::1]:44878 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xq5aF-0003IS-Th for ged-emacs-devel@m.gmane.org; Sun, 16 Nov 2014 14:34:03 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51685) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xq5a7-0003IB-GJ for emacs-devel@gnu.org; Sun, 16 Nov 2014 14:34:00 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xq5a2-0005kh-Ko for emacs-devel@gnu.org; Sun, 16 Nov 2014 14:33:55 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:34934) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xq5a2-0005kX-ER for emacs-devel@gnu.org; Sun, 16 Nov 2014 14:33:50 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Xq5a0-0003LB-4v for emacs-devel@gnu.org; Sun, 16 Nov 2014 20:33:48 +0100 Original-Received: from c-24-6-53-16.hsd1.ca.comcast.net ([24.6.53.16]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 16 Nov 2014 20:33:48 +0100 Original-Received: from wohler by c-24-6-53-16.hsd1.ca.comcast.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 16 Nov 2014 20:33:48 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 37 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: c-24-6-53-16.hsd1.ca.comcast.net User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.93 (gnu/linux) Cancel-Lock: sha1:Ou6/1Ph3Hc9iuoGaf52q+VZ2+DU= 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:177352 Archived-At: Achim Gratz writes: > Lars Magne Ingebrigtsen writes: >> You edit the files in either branch, `M-x vc-dir', and check in your >> changes. Then you need to push the data to the main repository. This >> will usually fail, since somebody else has pushed other changes in the >> meantime. To fix this, say >> >> git pull --rebase > > When working with upstream this is good practrice, but if you're going > to do that anyway, just configure your branch with "rebase = true". Or > configure "autosetuprebase = true" on a repo-wide or global basis so Git > will do that by default (you can always change that later of course). That's pull.rebase = true. Also, do you mean branch.autosetuprebase = always? 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? Would that setting appear in emacs/.git/config or elsewhere? The git config man page says this: NOTE: this is a possibly dangerous operation; do not use it unless you understand the implications (see git-rebase(1) for details). Does our global setting of pushNonFastForward mitigate these concerns? -- Bill Wohler aka http://www.newt.com/wohler/ GnuPG ID:610BD9AD