From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Wed, 25 Mar 2015 11:04:51 -0400 Message-ID: References: <86egoeusg2.fsf@example.com> <83pp7yp5po.fsf@gnu.org> <86sicte9j3.fsf@example.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1427295926 10514 80.91.229.3 (25 Mar 2015 15:05:26 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 25 Mar 2015 15:05:26 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Mar 25 16:05:19 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 1Yamrh-0004Pe-Lp for ged-emacs-devel@m.gmane.org; Wed, 25 Mar 2015 16:05:05 +0100 Original-Received: from localhost ([::1]:39568 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yamrg-0001Q2-Sy for ged-emacs-devel@m.gmane.org; Wed, 25 Mar 2015 11:05:04 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39841) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YamrY-0001Pm-Hg for emacs-devel@gnu.org; Wed, 25 Mar 2015 11:05:02 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YamrU-0001N2-Ew for emacs-devel@gnu.org; Wed, 25 Mar 2015 11:04:56 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:52031) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YamrU-0001Lp-BL for emacs-devel@gnu.org; Wed, 25 Mar 2015 11:04:52 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AgUFAGvvdVTO+KpL/2dsb2JhbAA3gVOhb4EIgXUBAQQBVh4KCws0EhQYDYg3ohGLdg0QFzoMA4M+A1KDHgSjY4RY X-IPAS-Result: AgUFAGvvdVTO+KpL/2dsb2JhbAA3gVOhb4EIgXUBAQQBVh4KCws0EhQYDYg3ohGLdg0QFzoMA4M+A1KDHgSjY4RY X-IronPort-AV: E=Sophos;i="5.01,1,1400040000"; d="scan'208";a="114548870" Original-Received: from 206-248-170-75.dsl.teksavvy.com (HELO pastel.home) ([206.248.170.75]) by ironport2-out.teksavvy.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 25 Mar 2015 11:04:52 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id 1F27E2441; Wed, 25 Mar 2015 11:04:51 -0400 (EDT) In-Reply-To: (Steinar Bang's message of "Wed, 25 Mar 2015 14:56:09 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.248.154.181 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:184227 Archived-At: >> I don't understand what you mean here by "shows the diffs for the >> commits in the commit list" and "shown inline". > The buffer shows a list of commits, one per each line, pressing enter of > a commit expands it, and shows the metadata of the commit. Ah, I see you're talking about the "log", I thought you were talking about something that had to do with the "commit" operation. > The most immediately annoying feature of vc-dir, was that it didn't > group the files into unstaged and staged, Indeed, this is a particular feature of Git, and vc-git hasn't figured out how to integrate it in the generic UI of VC. I tend not to use the index very heavily (I'm still a fairly young Git user, evidently), so I don't suffer from it too much, but it's clearly wrong (an obvious problem is when the file is modified in the index and this modification is undone in the actual file, so "git diff HEAD -- " is empty: then vc-dir will sometimes show the file as "up-to-date" and sometimes as "modified"). > because that's a very important distinction when manually resolving > merge conflicts. Hmm... I never/rarely care about the index while resolving conflicts, I just use smerge-mode and vc-find-next-conflicted-file and then commit the result (and I do these kinds of commit from the command line rather than from vc-dir). Stefan