From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Jan Nieuwenhuizen Newsgroups: gmane.emacs.devel Subject: Re: Git transition workflow Date: Tue, 12 Aug 2014 10:33:59 +0200 Organization: AvatarAcademy.nl Message-ID: <87sil214zs.fsf@drakenvlieg.flower> References: <2720487.3bKIskrhp0@descartes> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1407832465 7126 80.91.229.3 (12 Aug 2014 08:34:25 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 12 Aug 2014 08:34:25 +0000 (UTC) Cc: Paul Michael Reilly , rms@gnu.org, emacs-devel@gnu.org To: =?utf-8?Q?R=C3=BCdiger?= Sonderfeld Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Aug 12 10:34:20 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 1XH7X7-0004Rg-Ra for ged-emacs-devel@m.gmane.org; Tue, 12 Aug 2014 10:34:17 +0200 Original-Received: from localhost ([::1]:40052 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XH7X7-0007il-BL for ged-emacs-devel@m.gmane.org; Tue, 12 Aug 2014 04:34:17 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:55501) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XH7X0-0007iD-Ix for emacs-devel@gnu.org; Tue, 12 Aug 2014 04:34:15 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XH7Ww-00067W-05 for emacs-devel@gnu.org; Tue, 12 Aug 2014 04:34:10 -0400 Original-Received: from smtp-vbr12.xs4all.nl ([194.109.24.32]:1506) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XH7Wv-00067D-OM; Tue, 12 Aug 2014 04:34:05 -0400 Original-Received: from drakenvlieg.flower.peder.onsbrabantnet.nl (static.kpn.net [92.70.116.82] (may be forged)) (authenticated bits=0) by smtp-vbr12.xs4all.nl (8.13.8/8.13.8) with ESMTP id s7C8Y1kG023648 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Tue, 12 Aug 2014 10:34:03 +0200 (CEST) (envelope-from janneke@gnu.org) X-Url: http://AvatarAcademy.nl In-Reply-To: <2720487.3bKIskrhp0@descartes> (=?utf-8?Q?=22R=C3=BCdiger?= Sonderfeld"'s message of "Tue, 12 Aug 2014 10:07:24 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) X-Virus-Scanned: by XS4ALL Virus Scanner X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 194.109.24.32 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:173594 Archived-At: R=C3=BCdiger Sonderfeld writes: > ESR already took care of it: > > - http://www.emacswiki.org/emacs/GitQuickStartForEmacsDevs Daily work If you=E2=80=99re using the command-line: git pull May I suggest to change this to =20 git pull --rebase / git pull -r or we're going to see a whole lot of merge commits. Greetings, Jan --=20 Jan Nieuwenhuizen | GNU LilyPond http://lilypond.org Freelance IT http://JoyofSource.com | Avatar=C2=AE http://AvatarAcademy.nl= =20=20