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 15:42:34 -0400 Message-ID: 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 1540583152 23733 195.159.176.226 (26 Oct 2018 19:45:52 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 26 Oct 2018 19:45:52 +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 21:45:48 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 1gG83I-00065q-Fy for geh-help-gnu-emacs@m.gmane.org; Fri, 26 Oct 2018 21:45:48 +0200 Original-Received: from localhost ([::1]:33965 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gG85P-0003R6-0f for geh-help-gnu-emacs@m.gmane.org; Fri, 26 Oct 2018 15:47:59 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36446) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gG84w-0003QO-8S for help-gnu-emacs@gnu.org; Fri, 26 Oct 2018 15:47:30 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gG84q-0006N9-DD for help-gnu-emacs@gnu.org; Fri, 26 Oct 2018 15:47:30 -0400 Original-Received: from [195.159.176.226] (port=47042 helo=blaine.gmane.org) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gG84m-00065k-Ad for help-gnu-emacs@gnu.org; Fri, 26 Oct 2018 15:47:22 -0400 Original-Received: from list by blaine.gmane.org with local (Exim 4.84_2) (envelope-from ) id 1gG82a-0005KI-JQ for help-gnu-emacs@gnu.org; Fri, 26 Oct 2018 21:45:04 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 14 Original-X-Complaints-To: usenet@blaine.gmane.org Cancel-Lock: sha1:bfCCyKN/EJLEy0d3ZPrVEWWI6pk= 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:118429 Archived-At: > 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. Stefan