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: git is screwed Date: Thu, 26 Mar 2015 12:27:53 +0100 Message-ID: <5513ED39.8050408@math.ntnu.no> References: <20150322154147.GA6808@Tron.local> <20150323045209.GA71859@Tron.local> <550FE343.8010607@math.ntnu.no> <55119019.6030507@math.ntnu.no> <5513E96D.8070204@math.ntnu.no> 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 1427369596 6956 80.91.229.3 (26 Mar 2015 11:33:16 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 26 Mar 2015 11:33:16 +0000 (UTC) Cc: schwab@linux-m68k.org, emacs-devel@gnu.org To: rms@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Mar 26 12:33:09 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 1Yb626-00066C-59 for ged-emacs-devel@m.gmane.org; Thu, 26 Mar 2015 12:33:06 +0100 Original-Received: from localhost ([::1]:43966 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yb625-0004Zi-E8 for ged-emacs-devel@m.gmane.org; Thu, 26 Mar 2015 07:33:05 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37577) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yb5xB-0005GY-QD for emacs-devel@gnu.org; Thu, 26 Mar 2015 07:28:05 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yb5x8-0008Hf-Ck for emacs-devel@gnu.org; Thu, 26 Mar 2015 07:28:01 -0400 Original-Received: from hylle06.itea.ntnu.no ([129.241.56.235]:49433) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yb5x8-0008HS-5U; Thu, 26 Mar 2015 07:27:58 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by hylle06.itea.ntnu.no (Postfix) with ESMTP id 145836642F1; Thu, 26 Mar 2015 12:27:56 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at hylle06.itea.ntnu.no Original-Received: from [129.241.15.191] (dhcp-15191.math.ntnu.no [129.241.15.191]) (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 B70A4660261; Thu, 26 Mar 2015 12:27:55 +0100 (CET) User-Agent: Postbox 3.0.11 (Macintosh/20140602) In-Reply-To: <5513E96D.8070204@math.ntnu.no> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 129.241.56.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:184313 Archived-At: Harald Hanche-Olsen wrote: > The vast majority have M in the first column and a space in the second. > That means they are modified in the index (uh, staging area is the > modern name for it). They will be the result of the incomplete merge: > Most of them are files that have been modified in the remote repository > but not locally. The Ds have been deleted, and the As have been added. I could have added that this means those files marked M will be the=20 result of successfully merging your changes with those in the remote.=20 Think of it as the result piping diff output into patch. Or they are=20 just the ones changed remotely, if you have made no local changes. > I have to go now, no time for the next couple hours. But perhaps someon= e > else will give you advice. But now I *really* have to go. =E2=80=93 Harald