From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.devel Subject: Re: ChangeLog entries Date: Mon, 10 Aug 2015 14:17:33 -0700 Organization: UCLA Computer Science Department Message-ID: <55C914ED.5080808@cs.ucla.edu> References: <83vbcopkd3.fsf@gnu.org> <87lhdkmpmb.fsf@russet.org.uk> <87vbcnqosc.fsf@petton.fr> <83io8noycr.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1439241486 18947 80.91.229.3 (10 Aug 2015 21:18:06 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 10 Aug 2015 21:18:06 +0000 (UTC) Cc: phillip.lord@russet.org.uk, emacs-devel@gnu.org To: Eli Zaretskii , Nicolas Petton Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Aug 10 23:17:58 2015 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 1ZOuSB-0001R9-MQ for ged-emacs-devel@m.gmane.org; Mon, 10 Aug 2015 23:17:55 +0200 Original-Received: from localhost ([::1]:60176 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZOuSA-00013w-Sm for ged-emacs-devel@m.gmane.org; Mon, 10 Aug 2015 17:17:54 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:59597) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZOuRz-00013p-KP for emacs-devel@gnu.org; Mon, 10 Aug 2015 17:17:44 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZOuRy-0002jd-Mj for emacs-devel@gnu.org; Mon, 10 Aug 2015 17:17:43 -0400 Original-Received: from zimbra.cs.ucla.edu ([131.179.128.68]:39039) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZOuRu-0002hf-Rf; Mon, 10 Aug 2015 17:17:38 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 98E27160D1F; Mon, 10 Aug 2015 14:17:37 -0700 (PDT) Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id HySgPgfNNDZz; Mon, 10 Aug 2015 14:17:37 -0700 (PDT) Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 001E71601D0; Mon, 10 Aug 2015 14:17:36 -0700 (PDT) X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id ykDoNkubEQ1H; Mon, 10 Aug 2015 14:17:36 -0700 (PDT) Original-Received: from Penguin.CS.UCLA.EDU (Penguin.CS.UCLA.EDU [131.179.64.200]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id DA0761601BA; Mon, 10 Aug 2015 14:17:36 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.1.0 In-Reply-To: <83io8noycr.fsf@gnu.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 131.179.128.68 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:188708 Archived-At: Merge-vs-rebase is a common point of disagreement among Git users. Although I typically rebase, sometimes merging is better. My impression is that you really need to know what you're doing, regardless of whether you're merging or rebasing.