From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Kastrup Newsgroups: gmane.emacs.devel Subject: Re: "git pull -r" to avoid merge commits Date: Sun, 01 Jun 2014 07:04:53 +0200 Organization: Organization?!? Message-ID: <8738fpcj9m.fsf@fencepost.gnu.org> References: <87a99yqe0d.fsf@zigzag.favinet> <83lhtidpyf.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1401599139 17065 80.91.229.3 (1 Jun 2014 05:05:39 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 1 Jun 2014 05:05:39 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Jun 01 07:05:32 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 1Wqxxb-00021J-V3 for ged-emacs-devel@m.gmane.org; Sun, 01 Jun 2014 07:05:32 +0200 Original-Received: from localhost ([::1]:33858 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wqxxb-0004Qy-4R for ged-emacs-devel@m.gmane.org; Sun, 01 Jun 2014 01:05:31 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58373) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WqxxO-0004Pj-KW for emacs-devel@gnu.org; Sun, 01 Jun 2014 01:05:26 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WqxxH-0003gS-23 for emacs-devel@gnu.org; Sun, 01 Jun 2014 01:05:18 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:48215) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WqxxG-0003ao-Ry for emacs-devel@gnu.org; Sun, 01 Jun 2014 01:05:10 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1WqxxA-0001fv-Q0 for emacs-devel@gnu.org; Sun, 01 Jun 2014 07:05:04 +0200 Original-Received: from x2f3f23c.dyn.telefonica.de ([2.243.242.60]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 01 Jun 2014 07:05:04 +0200 Original-Received: from dak by x2f3f23c.dyn.telefonica.de with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 01 Jun 2014 07:05:04 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 18 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: x2f3f23c.dyn.telefonica.de X-Face: 2FEFf>]>q>2iw=B6, xrUubRI>pR&Ml9=ao@P@i)L:\urd*t9M~y1^:+Y]'C0~{mAl`oQuAl \!3KEIp?*w`|bL5qr,H)LFO6Q=qx~iH4DN; i"; /yuIsqbLLCh/!U#X[S~(5eZ41to5f%E@'ELIi$t^ Vc\LWP@J5p^rst0+('>Er0=^1{]M9!p?&:\z]|;&=NP3AhB!B_bi^]Pfkw User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4.50 (gnu/linux) Cancel-Lock: sha1:o5uWPaP6Z0u8yP/cZ0jMj1BDhc4= 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:172234 Archived-At: Eric Hanchrow writes: >> Why would you need to avoid merge commits? If they confuse the admin >> scripts, then perhaps fixing those scripts is a better way. > > Merge commits confuse humans. If someone's contribution is just one > or two commits, then the history is much easier to understand if they > rebase instead of merging. > > Merges make sense, though, when the new work is a long series of commits. The length of the series is marginal. What makes a difference is parallel ongoing work in both branches touching the same files. In that case, disentangling the intertwined histories may be more expensive than it is worth. -- David Kastrup