From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: =?utf-8?Q?=C3=93scar_Fuentes?= Newsgroups: gmane.emacs.help Subject: Re: How to commit hunks using VC? Date: Fri, 26 Oct 2018 21:59:57 +0200 Message-ID: <87k1m4xyv6.fsf@telefonica.net> References: <87sh0s7say.fsf@example.com> <83tvl8obl4.fsf@gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: blaine.gmane.org 1540583912 13899 195.159.176.226 (26 Oct 2018 19:58:32 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 26 Oct 2018 19:58:32 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1.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 21:58:28 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 1gG8FY-0003WV-7L for geh-help-gnu-emacs@m.gmane.org; Fri, 26 Oct 2018 21:58:28 +0200 Original-Received: from localhost ([::1]:34003 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gG8He-0001HA-Ps for geh-help-gnu-emacs@m.gmane.org; Fri, 26 Oct 2018 16:00:38 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39535) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gG8HD-0001Gz-Nf for help-gnu-emacs@gnu.org; Fri, 26 Oct 2018 16:00:12 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gG8H9-0002h4-M2 for help-gnu-emacs@gnu.org; Fri, 26 Oct 2018 16:00:11 -0400 Original-Received: from [195.159.176.226] (port=37007 helo=blaine.gmane.org) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gG8H9-0002gc-Dn for help-gnu-emacs@gnu.org; Fri, 26 Oct 2018 16:00:07 -0400 Original-Received: from list by blaine.gmane.org with local (Exim 4.84_2) (envelope-from ) id 1gG8Ez-0002nP-88 for help-gnu-emacs@gnu.org; Fri, 26 Oct 2018 21:57:53 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 21 Original-X-Complaints-To: usenet@blaine.gmane.org Cancel-Lock: sha1:cYyKk/9YXCz0QCNhiCVJsdGUl5c= 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:118431 Archived-At: Stefan Monnier writes: >> If I need to commit a change that is finer than a single line, I can >> press ‘RET’ on the relevant line in the diff, which takes me to the >> buffer of the file at point, with point on the corresponding line. I >> can edit the line, save the file, switch to the status buffer, stage >> the line, switch back to the file, and undo the changes so that I >> could put them in the next commit. >> Stash never enters the picture. > > Whether you use "do ... undo" as above, or "cp foo foo.bak ... cp > foo.bak foo" or "stash ... unstash" is up to you. To me these are just > minor variants of the same approach. Please note that the "do ... undo" method is only required with Magit to commit "a change that is is finer than a single line". I have a genuine interest on why some people avoid Magit. I stopped recommending it on emacs.devel whenever a git question pops up because, apparently, the people who post those questions are utterly uninterested on a tool that solves their usability problems altogether :-)