From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii 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: Wed, 08 Apr 2015 21:29:50 +0300 Message-ID: <83sicafp7l.fsf@gnu.org> References: <552130FE.1010101@yandex.ru> <83mw2mn2no.fsf@gnu.org> <5521359D.2000509@yandex.ru> <83fv8emvgq.fsf@gnu.org> <55219139.8040507@yandex.ru> <83oan2l4pk.fsf@gnu.org> <5521B811.8070603@yandex.ru> <83d23hlmia.fsf@gnu.org> <20150407165131.GA2600@acm.fritz.box> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1428517798 13520 80.91.229.3 (8 Apr 2015 18:29:58 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 8 Apr 2015 18:29:58 +0000 (UTC) Cc: acm@muc.de, emacs-devel@gnu.org To: rms@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Apr 08 20:29:52 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 1YfujT-0004lm-Ef for ged-emacs-devel@m.gmane.org; Wed, 08 Apr 2015 20:29:47 +0200 Original-Received: from localhost ([::1]:54318 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YfujS-0006JT-Py for ged-emacs-devel@m.gmane.org; Wed, 08 Apr 2015 14:29:46 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39081) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YfujP-0006JD-RZ for emacs-devel@gnu.org; Wed, 08 Apr 2015 14:29:44 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YfujM-0001me-Lh for emacs-devel@gnu.org; Wed, 08 Apr 2015 14:29:43 -0400 Original-Received: from mtaout29.012.net.il ([80.179.55.185]:47567) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YfujM-0001mY-DE; Wed, 08 Apr 2015 14:29:40 -0400 Original-Received: from conversion-daemon.mtaout29.012.net.il by mtaout29.012.net.il (HyperSendmail v2007.08) id <0NMI00E00389SS00@mtaout29.012.net.il>; Wed, 08 Apr 2015 21:27:22 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout29.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NMI00DKF39MAC10@mtaout29.012.net.il>; Wed, 08 Apr 2015 21:27:22 +0300 (IDT) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.185 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:185168 Archived-At: > Date: Wed, 08 Apr 2015 14:21:42 -0400 > From: Richard Stallman > Cc: emacs-devel@gnu.org > > Maybe we could develop a version of git pull that merges like CVS, > rather than failing when remote changes are in the same file as a > local change. git-pull is a shell script, you will find it in libexec/git-core/ directory. Someone who knows enough about low-level Git commands can write a modified script to do whatever they like.