From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: Understanding a recent commit in emacs-25 branch [ed19f2] Date: Sun, 03 Apr 2016 13:27:02 +0200 Message-ID: <87shz3yltl.fsf@linux-m68k.org> References: <20160403111708.GA3537@acm.fritz.box> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1459682846 24487 80.91.229.3 (3 Apr 2016 11:27:26 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 3 Apr 2016 11:27:26 +0000 (UTC) Cc: Emacs developers , Kaushal Modi To: Alan Mackenzie Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 03 13:27:26 2016 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 1amgBh-0005jL-Rt for ged-emacs-devel@m.gmane.org; Sun, 03 Apr 2016 13:27:25 +0200 Original-Received: from localhost ([::1]:52910 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amgBh-00033u-BS for ged-emacs-devel@m.gmane.org; Sun, 03 Apr 2016 07:27:25 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34732) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amgBU-00033o-Hv for emacs-devel@gnu.org; Sun, 03 Apr 2016 07:27:13 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1amgBP-0003RC-To for emacs-devel@gnu.org; Sun, 03 Apr 2016 07:27:12 -0400 Original-Received: from mail-out.m-online.net ([2001:a60:0:28:0:1:25:1]:34712) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amgBP-0003Qf-Mq for emacs-devel@gnu.org; Sun, 03 Apr 2016 07:27:07 -0400 Original-Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3qdCWX1cRVz3hjlq; Sun, 3 Apr 2016 13:27:04 +0200 (CEST) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 3qdCWX1F7Kzvh2B; Sun, 3 Apr 2016 13:27:04 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Original-Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.68]) (amavisd-new, port 10024) with ESMTP id jLBdywdG4pcQ; Sun, 3 Apr 2016 13:27:03 +0200 (CEST) X-Auth-Info: aL2uiX2ovP+BoERlzkD9R01i3dPU8BT3+tlrcpEWC6bx5IkFJAhGq7+aPWdk2UgN Original-Received: from igel.home (ppp-88-217-22-197.dynamic.mnet-online.de [88.217.22.197]) by mail.mnet-online.de (Postfix) with ESMTPA; Sun, 3 Apr 2016 13:27:02 +0200 (CEST) Original-Received: by igel.home (Postfix, from userid 1000) id B00372C3440; Sun, 3 Apr 2016 13:27:02 +0200 (CEST) X-Yow: Mmmmmm-MMMMMM!! A plate of STEAMING PIECES of a PIG mixed with the shreds of SEVERAL CHICKENS!!... Oh BOY!! I'm about to swallow a TORN-OFF section of a COW'S LEFT LEG soaked in COTTONSEED OIL and SUGAR!! .. Let's see.. Next, I'll have the GROUND-UP flesh of CUTE, BABY LAMBS fried in the MELTED, FATTY TISSUES from a warm-blooded animal someone once PETTED!! ... YUM!! That was GOOD!! For DESSERT, I'll have a TOFU BURGER with BEAN SPROUTS on a stone-ground, WHOLE WHEAT BUN!! In-Reply-To: <20160403111708.GA3537@acm.fritz.box> (Alan Mackenzie's message of "Sun, 3 Apr 2016 11:17:08 +0000") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.92 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 2001:a60:0:28:0:1:25:1 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:202612 Archived-At: Alan Mackenzie writes: > It would also be nice if such "pseudo merges" could be handled locally, In git, *all* operations happen locally (until you run git push). Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."