From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Engster Newsgroups: gmane.emacs.devel Subject: Re: Rewriting bzrmerge.el Date: Sat, 15 Nov 2014 21:02:58 +0100 Message-ID: <8761egw7t9.fsf@engster.org> References: <20141027000718.F09B5382A66@snark.thyrsus.com> <87bno8y0rt.fsf_-_@engster.org> <838ujcfn1i.fsf@gnu.org> <87ppcowhhd.fsf@engster.org> <8761egmjzh.fsf@fencepost.gnu.org> <83tx20e3sx.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1416081815 26044 80.91.229.3 (15 Nov 2014 20:03:35 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 15 Nov 2014 20:03:35 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 15 21:03:29 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 1XpjZA-0000xQ-OI for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 21:03:28 +0100 Original-Received: from localhost ([::1]:41830 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpjZA-0008EK-Cy for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 15:03:28 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51116) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpjYt-0008EB-DD for emacs-devel@gnu.org; Sat, 15 Nov 2014 15:03:16 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XpjYo-000101-6Z for emacs-devel@gnu.org; Sat, 15 Nov 2014 15:03:11 -0500 Original-Received: from randomsample.de ([5.45.97.173]:34040) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpjYn-0000zB-US; Sat, 15 Nov 2014 15:03:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=randomsample.de; s=a; h=Content-Type:MIME-Version:Message-ID:Date:References:In-Reply-To:Subject:Cc:To:From; bh=+rqrF22DF3OldsR40KgXYSRvdx1jLFxnuLw3RyOycsU=; b=Vf/yT1KvmIRPFqvK111oDX0KVaRes6OoCXG/vd7j2pj6hefFg1VFh/z00OFpX4llqwy8tXlvZ0X1gF8edDUqAqx/am2/K75ILt4pJviMj+RLlFR7eLKVKhCA5VEzcNe7; Original-Received: from ip2504b377.dynamic.kabel-deutschland.de ([37.4.179.119] helo=spaten) by randomsample.de with esmtpsa (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1XpjYm-0001gT-H4; Sat, 15 Nov 2014 21:03:04 +0100 In-Reply-To: <83tx20e3sx.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 15 Nov 2014 20:06:54 +0200") User-Agent: Gnus/5.13001 (Ma Gnus v0.10) Emacs/24.3.91 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 5.45.97.173 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:177242 Archived-At: Eli Zaretskii writes: >> From: David Kastrup >> Date: Sat, 15 Nov 2014 18:50:10 +0100 >> >> git rebase -i > > Wouldn't that unnecessarily annoy, since most of the commits should be > merged, and only a minority (sometimes non-existing minority) should > not? Since rebase cannot squash merge commits I wouldn't know how it helps in the first place, but I'm probably being dense. -David