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: VC mode and git Date: Thu, 02 Apr 2015 22:11:05 +0300 Message-ID: <83zj6qpcqe.fsf@gnu.org> References: <83twx2xoc8.fsf@gnu.org> <87619hke3u.fsf@uwakimon.sk.tsukuba.ac.jp> <551A3F17.6020903@math.ntnu.no> <20150331085055.GA2871@acm.fritz.box> <87zj6tiko1.fsf@uwakimon.sk.tsukuba.ac.jp> <20150331104935.GB2871@acm.fritz.box> <87y4mdi7tj.fsf@uwakimon.sk.tsukuba.ac.jp> <20150331214347.GH2871@acm.fritz.box> <20150401103225.GA2633@acm.fritz.box> <87h9t080gx.fsf@javad.com> <83384jsx3o.fsf@gnu.org> <83pp7nrfdn.fsf@gnu.org> <83a8yqr226.fsf@gnu.org> <831tk2qvz5.fsf@gnu.org> <87bnj6v0zp.fsf@igel.home> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1428001897 5162 80.91.229.3 (2 Apr 2015 19:11:37 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 2 Apr 2015 19:11:37 +0000 (UTC) Cc: sorganov@gmail.com, emacs-devel@gnu.org To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Apr 02 21:11:30 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 1YdkWY-0004CT-2b for ged-emacs-devel@m.gmane.org; Thu, 02 Apr 2015 21:11:30 +0200 Original-Received: from localhost ([::1]:59868 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdkWW-0001Gu-UY for ged-emacs-devel@m.gmane.org; Thu, 02 Apr 2015 15:11:28 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33347) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdkWJ-0001Gp-PY for emacs-devel@gnu.org; Thu, 02 Apr 2015 15:11:16 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YdkWG-00061b-Td for emacs-devel@gnu.org; Thu, 02 Apr 2015 15:11:15 -0400 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:49166) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdkWG-00061H-L5 for emacs-devel@gnu.org; Thu, 02 Apr 2015 15:11:12 -0400 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0NM700C00142ZD00@a-mtaout22.012.net.il> for emacs-devel@gnu.org; Thu, 02 Apr 2015 22:11:11 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NM700C5Q1AMTT70@a-mtaout22.012.net.il>; Thu, 02 Apr 2015 22:11:11 +0300 (IDT) In-reply-to: <87bnj6v0zp.fsf@igel.home> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.172 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:184802 Archived-At: > From: Andreas Schwab > Cc: Sergey Organov , emacs-devel@gnu.org > Date: Thu, 02 Apr 2015 20:28:10 +0200 > > Eli Zaretskii writes: > > > And that meta-data needs to be brought in as part of the merge, in > > addition to changes to the tree. > > Just like a commit with a single parent, or any commit. I never said otherwise. This is not about differences (or lack thereof) between a "normal" commit and a merge-commit.