From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eric Hanchrow Newsgroups: gmane.emacs.devel Subject: Re: "git pull -r" to avoid merge commits Date: Sat, 31 May 2014 21:14:57 -0700 Message-ID: References: <87a99yqe0d.fsf@zigzag.favinet> <83lhtidpyf.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Trace: ger.gmane.org 1401596135 24842 80.91.229.3 (1 Jun 2014 04:15:35 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 1 Jun 2014 04:15:35 +0000 (UTC) Cc: Thien-Thi Nguyen , emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Jun 01 06:15:28 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 1WqxB9-0002KW-UW for ged-emacs-devel@m.gmane.org; Sun, 01 Jun 2014 06:15:28 +0200 Original-Received: from localhost ([::1]:33795 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WqxB9-0001LS-Ah for ged-emacs-devel@m.gmane.org; Sun, 01 Jun 2014 00:15:27 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52603) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WqxB4-0001LC-Ef for emacs-devel@gnu.org; Sun, 01 Jun 2014 00:15:23 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WqxB3-0006fu-L3 for emacs-devel@gnu.org; Sun, 01 Jun 2014 00:15:22 -0400 Original-Received: from mail-we0-x233.google.com ([2a00:1450:400c:c03::233]:34235) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WqxB1-0006ea-Eb; Sun, 01 Jun 2014 00:15:19 -0400 Original-Received: by mail-we0-f179.google.com with SMTP id q59so3736824wes.10 for ; Sat, 31 May 2014 21:15:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type; bh=Lbh3rgZTxSo/oCEcnIbTOXEot4rybcGCqhwjaUt7ozE=; b=0AtSTedMJKmhtS3uXGPULrHQ7yUHB2aSFpOzr6tckOTpsFAn251/RM/qn+g8L0chqA S2SAkndiftnkIlOL0o+n4JvuiiDUHLylhi2h73Jql4SY+DQ/zaIzMElVbxZfdkTzk7XQ oBUlpGLa3GBfJDCg0k3QH1L3e26JHEsJFxSEmACW/WWsz+0rXqYnH3WJ2LNhCoNEG0sK WZ24CSYObKnj5Ll8eqoCctSk2F278GCfc+aMXdMop4jKkA4nLDAsOGDHfSAXAcBSZJJB 1IuIF4Qfm5wcXX+baXOPqabGi3wITpToBt3jKBBuIaKdZD7CGPxbN71ixkFliT8LApMX xC5w== X-Received: by 10.180.78.71 with SMTP id z7mr11640874wiw.14.1401596117985; Sat, 31 May 2014 21:15:17 -0700 (PDT) Original-Received: by 10.194.80.5 with HTTP; Sat, 31 May 2014 21:14:57 -0700 (PDT) In-Reply-To: <83lhtidpyf.fsf@gnu.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c03::233 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:172233 Archived-At: > 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.