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: VC mode and git Date: Sun, 05 Apr 2015 22:01:45 +0200 Message-ID: <552194A9.20005@math.ntnu.no> References: <5511998E.8080309@cs.ucla.edu> <5512F8C7.7010509@math.ntnu.no> <5513F889.4000404@math.ntnu.no> <552102D6.1030106@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 1428264132 22576 80.91.229.3 (5 Apr 2015 20:02:12 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 5 Apr 2015 20:02:12 +0000 (UTC) Cc: eggert@cs.ucla.edu, emacs-devel@gnu.org To: rms@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 05 22:02:07 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 1YeqkA-0003cJ-9P for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 22:02:06 +0200 Original-Received: from localhost ([::1]:37462 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yeqk9-0002Ft-RP for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 16:02:05 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:54193) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yeqjx-0002CO-8Z for emacs-devel@gnu.org; Sun, 05 Apr 2015 16:01:54 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yeqju-0004X1-KR for emacs-devel@gnu.org; Sun, 05 Apr 2015 16:01:53 -0400 Original-Received: from hylle05.itea.ntnu.no ([2001:700:300:3::225]:42758) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yeqju-0004Wo-Cp; Sun, 05 Apr 2015 16:01:50 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by hylle05.itea.ntnu.no (Postfix) with ESMTP id CE559901307; Sun, 5 Apr 2015 22:01:48 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at hylle05.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 hylle05.itea.ntnu.no (Postfix) with ESMTPSA id B8C239010EA; Sun, 5 Apr 2015 22:01:47 +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::225 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:184977 Archived-At: Richard Stallman wrote: > How fragile and complicated git is. Complicated, sure. But fragile? I am not so sure. Apart from commands like git reset --hard, it seems very difficult to=20 actually lose data with git. But it is possible to get into a state=20 which is hard to get out of, as you (we all) have discovered. Apropos of that, I have a question for the git experts out there. If you read the glossary, you will find that the index can hold three=20 versions of the same file. This happens only, I believe, with a merge=20 that had conflicts. The stash, on the other hand, seems to be just a=20 sort of temporary commit, where you can put things to get them out of=20 the way and retrieve them afterwards. From this it is my guess that stashing in the middle of a merge with=20 conflicts is not safe, as the stash is not capable of holding multiple=20 versions of a single file. Or am I wrong about that? I have not been=20 able to find out by reading the documentation, but perhaps I have been=20 looking in the wrong place. This concern is one reason I asked Richard at one point about the output=20 of =E2=80=9Cgit ls-tree -u=E2=80=9D. When it turned out to be empty, I wa= s much relieved. =E2=80=93 Harald