From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Achim Gratz Newsgroups: gmane.emacs.devel Subject: Re: Messing with the VC history Date: Sun, 16 Nov 2014 09:19:12 +0100 Organization: Linux Private Site Message-ID: <87ppcnk16n.fsf@Rainer.invalid> References: <87k32vsm8u.fsf@wanadoo.es> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: ger.gmane.org 1416125995 11967 80.91.229.3 (16 Nov 2014 08:19:55 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 16 Nov 2014 08:19:55 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Nov 16 09:19:49 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 1Xpv3i-00054L-Sn for ged-emacs-devel@m.gmane.org; Sun, 16 Nov 2014 09:19:47 +0100 Original-Received: from localhost ([::1]:43196 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xpv3i-0001Br-F5 for ged-emacs-devel@m.gmane.org; Sun, 16 Nov 2014 03:19:46 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50086) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xpv3Y-0001Bi-IU for emacs-devel@gnu.org; Sun, 16 Nov 2014 03:19:43 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xpv3S-00046j-AU for emacs-devel@gnu.org; Sun, 16 Nov 2014 03:19:36 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:60986) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xpv3S-00046I-3R for emacs-devel@gnu.org; Sun, 16 Nov 2014 03:19:30 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Xpv3M-0004vU-Hs for emacs-devel@gnu.org; Sun, 16 Nov 2014 09:19:24 +0100 Original-Received: from pd9eb3aa3.dip0.t-ipconnect.de ([217.235.58.163]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 16 Nov 2014 09:19:24 +0100 Original-Received: from Stromeko by pd9eb3aa3.dip0.t-ipconnect.de with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 16 Nov 2014 09:19:24 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 16 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: pd9eb3aa3.dip0.t-ipconnect.de User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4.51 (gnu/linux) Cancel-Lock: sha1:SCaRRgjjJpyZeBs4DYtKifNVGvk= 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:177285 Archived-At: Óscar Fuentes writes: > IMO we should encourage people to use fetch+rebase instead of `pull', > reserving merges for logically-related changes that comprise multiple > commits. ...or configure Git to have "git pull" do exactly that, at least for the branches that are going upstream. Regards, Achim. -- +<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+ Samples for the Waldorf Blofeld: http://Synth.Stromeko.net/Downloads.html#BlofeldSamplesExtra