From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.help Subject: Re: vc for git users. Date: Tue, 29 Oct 2019 13:38:42 -0400 Message-ID: References: <20191028142107.koe7faofoqmsljel@Ergus> <834kzssv58.fsf@gnu.org> <2E3DDD9F-5E02-4C7A-AAFE-83A4B0345830@aol.com> <83k18npsr1.fsf@gnu.org> <87sgnbzm7z.fsf@gnus.org> <83imo7prdg.fsf@gnu.org> <42b1ece2-e54a-2b40-ded4-a8cda7450b51@yandex.ru> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="44963"; mail-complaints-to="usenet@blaine.gmane.org" 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 Tue Oct 29 18:39:07 2019 Return-path: Envelope-to: geh-help-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1iPVSU-000BVr-0W for geh-help-gnu-emacs@m.gmane.org; Tue, 29 Oct 2019 18:39:06 +0100 Original-Received: from localhost ([::1]:60434 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iPVSS-0005rw-TA for geh-help-gnu-emacs@m.gmane.org; Tue, 29 Oct 2019 13:39:04 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:35350) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iPVSI-0005rU-2m for help-gnu-emacs@gnu.org; Tue, 29 Oct 2019 13:38:55 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iPVSH-0004Vp-5J for help-gnu-emacs@gnu.org; Tue, 29 Oct 2019 13:38:54 -0400 Original-Received: from 195-159-176-226.customer.powertech.no ([195.159.176.226]:52860 helo=blaine.gmane.org) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iPVSF-0004Tg-MD for help-gnu-emacs@gnu.org; Tue, 29 Oct 2019 13:38:53 -0400 Original-Received: from list by blaine.gmane.org with local (Exim 4.89) (envelope-from ) id 1iPVSD-000BBw-Hr for help-gnu-emacs@gnu.org; Tue, 29 Oct 2019 18:38:49 +0100 X-Injected-Via-Gmane: http://gmane.org/ Cancel-Lock: sha1:d/6FyOvjKy9G8Fq8ZO48z97TXNs= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 195.159.176.226 X-BeenThere: help-gnu-emacs@gnu.org X-Mailman-Version: 2.1.23 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:121757 Archived-At: > Not sure what the closest VCS-neutral approach would be. Back in PCV-CVS days I had a `vc-start-partial-checkin` which would copy the current buffer's file to .~vc-ppci~ and setup had an after-commit hook which reverted to the saved .~vc-ppci~ copy. So I used M-x vc-start-partial-checkin RET, then used diff-mode and direct editing to undo the parts I didn't want to commit yet, then did the C-x v v. I still think it's a pretty convenient workflow since you're not limited to a hunk granularity. I often do the same by hand nowadays: - git stash - vc-git-stash-show - from the *vc-diff*, re-apply the parts I want - commit - git stash apply+drop Stefan