From: Stefan Monnier <monnier@iro.umontreal.ca>
To: help-gnu-emacs@gnu.org
Subject: Re: vc for git users.
Date: Tue, 29 Oct 2019 13:38:42 -0400 [thread overview]
Message-ID: <jwvlft3zcnm.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: 42b1ece2-e54a-2b40-ded4-a8cda7450b51@yandex.ru
> 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 <filename>.~vc-ppci~ and
setup had an after-commit hook which reverted to the saved
<filename>.~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
next prev parent reply other threads:[~2019-10-29 17:38 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-28 14:21 vc for git users Ergus
2019-10-28 15:36 ` Pankaj Jangid
2019-10-28 16:16 ` Eli Zaretskii
2019-10-28 21:50 ` Skip Montanaro
2019-10-28 23:40 ` VanL
2019-10-29 8:30 ` Eric S Fraga
2019-10-29 2:42 ` Ergus via Users list for the GNU Emacs text editor
2019-10-29 13:48 ` Eli Zaretskii
[not found] ` <mailman.65.1572356923.4165.help-gnu-emacs@gnu.org>
2019-10-29 13:59 ` Lars Magne Ingebrigtsen
2019-10-29 14:18 ` Eli Zaretskii
2019-10-29 15:31 ` Dmitry Gutov
2019-10-29 16:31 ` Eli Zaretskii
2019-10-29 17:38 ` Stefan Monnier [this message]
2019-10-29 18:00 ` Steinar Bang
2019-10-29 20:09 ` Štěpán Němec
2019-10-30 9:34 ` Marcin Borkowski
2019-10-30 13:43 ` Robert Pluim
[not found] ` <mailman.69.1572358708.4165.help-gnu-emacs@gnu.org>
2019-10-29 20:52 ` Lars Magne Ingebrigtsen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=jwvlft3zcnm.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=help-gnu-emacs@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.