From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.help Subject: Re: How to commit hunks using VC? Date: Fri, 26 Oct 2018 17:17:46 -0400 Message-ID: References: <87sh0s7say.fsf@example.com> <83tvl8obl4.fsf@gnu.org> <87k1m4xyv6.fsf@telefonica.net> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit X-Trace: blaine.gmane.org 1540588623 9123 195.159.176.226 (26 Oct 2018 21:17:03 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 26 Oct 2018 21:17:03 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) To: help-gnu-emacs@gnu.org Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Fri Oct 26 23:16:59 2018 Return-path: Envelope-to: geh-help-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gG9TW-0002G9-Ax for geh-help-gnu-emacs@m.gmane.org; Fri, 26 Oct 2018 23:16:58 +0200 Original-Received: from localhost ([::1]:34209 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gG9Vc-0008PO-IF for geh-help-gnu-emacs@m.gmane.org; Fri, 26 Oct 2018 17:19:08 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57325) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gG9Ue-0008BP-5A for help-gnu-emacs@gnu.org; Fri, 26 Oct 2018 17:18:09 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gG9UX-00054J-8u for help-gnu-emacs@gnu.org; Fri, 26 Oct 2018 17:18:06 -0400 Original-Received: from [195.159.176.226] (port=40360 helo=blaine.gmane.org) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gG9US-0004va-Pl for help-gnu-emacs@gnu.org; Fri, 26 Oct 2018 17:17:57 -0400 Original-Received: from list by blaine.gmane.org with local (Exim 4.84_2) (envelope-from ) id 1gG9SJ-000137-7z for help-gnu-emacs@gnu.org; Fri, 26 Oct 2018 23:15:43 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 28 Original-X-Complaints-To: usenet@blaine.gmane.org Cancel-Lock: sha1:LMDKEoPXJxnK0Jb1+wwOXCHYtr8= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 195.159.176.226 X-BeenThere: help-gnu-emacs@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Users list for the GNU Emacs text editor List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "help-gnu-emacs" Xref: news.gmane.org gmane.emacs.help:118432 Archived-At: Óscar Fuentes writes: [...] > Please note that the "do ... undo" method is only required with Magit to > commit "a change that is is finer than a single line". Yuri Khan writes: [...] > Essentially, yes, but do/undo operates on line level, cp on file > level, and stash/unstash on the whole working copy. > > Also, the situation where you have one version of the line on the > branch, a different one in the working copy, and need to stage a third > one that differs from both of the above, is rare. Just to clarify: I did not intend to discourage people from using Magit or any other option they like. I just described a hack I wrote before Git even existed (and that I threw away since), and how to do something similar within the confines of the actually available VC, as requested by the OP. > I have a genuine interest on why some people avoid Magit. I don't avoid it: I just got used to using the command line for most Git operations (probably dating back to using the command like for Bzr for lack of an equivalent to the PCL-CVS that I maintained before). Stefan