From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Harald Hanche-Olsen Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] master 4e23cd0 4/5: * mail/rmail.el (rmail-show-message-1): When displaying a mime message, Date: Sun, 05 Apr 2015 21:01:35 +0200 Message-ID: <5521868F.6060408@math.ntnu.no> References: <20150405124321.362.95112@vcs.savannah.gnu.org> <552130FE.1010101@yandex.ru> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1428260511 899 80.91.229.3 (5 Apr 2015 19:01:51 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 5 Apr 2015 19:01:51 +0000 (UTC) Cc: emacs-devel@gnu.org, Dmitry Gutov To: rms@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 05 21:01:44 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 1Yepnk-0005iH-0o for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 21:01:44 +0200 Original-Received: from localhost ([::1]:37349 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yepnj-0005Km-Cw for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 15:01:43 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47020) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yepng-0005KW-2O for emacs-devel@gnu.org; Sun, 05 Apr 2015 15:01:40 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yepnf-0001Bb-5n for emacs-devel@gnu.org; Sun, 05 Apr 2015 15:01:40 -0400 Original-Received: from hylle06.itea.ntnu.no ([2001:700:300:3::235]:41002) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yepne-0001Ai-Ua; Sun, 05 Apr 2015 15:01:39 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by hylle06.itea.ntnu.no (Postfix) with ESMTP id 6FB9B66AC9E; Sun, 5 Apr 2015 21:01:37 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at hylle06.itea.ntnu.no Original-Received: from [IPv6:2001:4662:4ffb::9c03:cb99:4344:82bc] (unknown [IPv6:2001:4662:4ffb:0:9c03:cb99:4344:82bc]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: hanche) by hylle06.itea.ntnu.no (Postfix) with ESMTPSA id 0911C66ABF9; Sun, 5 Apr 2015 21:01:36 +0200 (CEST) User-Agent: Postbox 3.0.11 (Macintosh/20140602) In-Reply-To: X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:700:300:3::235 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:184966 Archived-At: Richard Stallman wrote: > I was told > > If I am right, you will see the changes you made, and nothing else= . > If so, fix up your commit message to something more reasonable wit= h git > commit --amend, and you're good to go. > > I had to guess what a "more reasonable" message is, and this is what I > guessed. > > If my guess was not what you like, it's Git's fault. I am more to blame for that than git is. In my defense, I was working on=20 limited information, and I hadn't learned the expected format of a merge=20 log message. But I think it's all worked out well in the end, not least=20 thanks to Eli's efforts. =E2=80=93 Harald