From: Stefan Monnier <monnier@iro.umontreal.ca>
To: help-gnu-emacs@gnu.org
Subject: Re: How to commit hunks using VC?
Date: Fri, 26 Oct 2018 17:17:46 -0400 [thread overview]
Message-ID: <jwvtvl8l8ka.fsf-monnier+gmane.emacs.help@gnu.org> (raw)
In-Reply-To: 87k1m4xyv6.fsf@telefonica.net
Óscar Fuentes <ofv@wanadoo.es> 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 <yurivkhan@gmail.com> 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
next prev parent reply other threads:[~2018-10-26 21:17 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-26 13:26 How to commit hunks using VC? Diogo F. S. Ramos
2018-10-26 14:34 ` Dan Čermák
2018-10-26 15:56 ` Stefan Monnier
2018-10-26 16:43 ` Carlos Konstanski
2018-10-26 17:35 ` Eli Zaretskii
2018-10-26 18:44 ` Stefan Monnier
2018-10-26 19:34 ` Yuri Khan
2018-10-26 19:42 ` Stefan Monnier
2018-10-26 19:57 ` Yuri Khan
2018-10-26 19:59 ` Óscar Fuentes
2018-10-26 21:17 ` Stefan Monnier [this message]
2018-10-26 21:55 ` Óscar Fuentes
2018-10-26 22:16 ` Michael Heerdegen
2018-10-26 23:07 ` Stefan Monnier
2018-10-27 0:22 ` Michael Heerdegen
2018-10-26 18:03 ` Diogo F. S. Ramos
2018-10-26 18:48 ` Stefan Monnier
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=jwvtvl8l8ka.fsf-monnier+gmane.emacs.help@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.