From: Eli Zaretskii <eliz@gnu.org>
To: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: sb@dod.no, emacs-devel@gnu.org
Subject: Re: git is screwed
Date: Fri, 27 Mar 2015 10:24:31 +0300 [thread overview]
Message-ID: <83fv8qnbrk.fsf@gnu.org> (raw)
In-Reply-To: <jwv8uej2xvl.fsf-monnier+emacs@gnu.org>
> From: Stefan Monnier <monnier@iro.umontreal.ca>
> Cc: Steinar Bang <sb@dod.no>, emacs-devel@gnu.org
> Date: Thu, 26 Mar 2015 18:34:21 -0400
>
> > It's a minor mode, so of course it's configurable: just switch it off.
>
> The "git add" part is independent from smerge-mode (tho they're linked
> by the fact that they both depend on the VC backend being able to
> recognize that a file has conflicts). So turning smerge-mode off won't help.
It wasn't clear from the question what needs to be configurable.
There was another advice, which you elided, that would disable "git
add" as well.
next prev parent reply other threads:[~2015-03-27 7:24 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-22 14:17 git is screwed Richard Stallman
2015-03-22 14:53 ` Andreas Schwab
2015-03-23 3:25 ` Richard Stallman
[not found] ` <20150322154147.GA6808@Tron.local>
[not found] ` <E1YZszx-0004Ff-JK@fencepost.gnu.org>
2015-03-23 4:52 ` Sam Gwydir
2015-03-23 9:56 ` Harald Hanche-Olsen
2015-03-24 15:54 ` Richard Stallman
2015-03-24 16:26 ` Harald Hanche-Olsen
2015-03-26 10:54 ` Richard Stallman
2015-03-26 11:11 ` Harald Hanche-Olsen
2015-03-26 11:27 ` Harald Hanche-Olsen
2015-03-26 12:21 ` Steinar Bang
2015-03-26 14:16 ` Stefan Monnier
2015-03-26 17:04 ` Eli Zaretskii
2015-03-26 19:02 ` Steinar Bang
2015-03-26 20:29 ` Eli Zaretskii
2015-03-26 22:34 ` Stefan Monnier
2015-03-27 7:24 ` Eli Zaretskii [this message]
2015-03-27 13:09 ` Stefan Monnier
2015-03-27 19:35 ` Steinar Bang
2015-03-27 19:59 ` Eli Zaretskii
2015-03-27 20:36 ` Steinar Bang
2015-03-27 19:30 ` Steinar Bang
2015-03-26 10:54 ` Richard Stallman
2015-03-26 15:10 ` John Wiegley
2015-03-26 10:54 ` Richard Stallman
2015-03-25 8:29 ` Steinar Bang
2015-03-25 10:29 ` Artur Malabarba
2015-03-25 12:41 ` Stefan Monnier
2015-03-25 13:42 ` Steinar Bang
2015-03-25 14:32 ` Artur Malabarba
2015-03-25 23:23 ` Jonas Bernoulli
2015-03-26 0:35 ` Stefan Monnier
2015-03-26 1:42 ` John Yates
2015-03-26 2:04 ` Stefan Monnier
2015-03-26 8:00 ` Steinar Bang
2015-03-26 8:28 ` Alexis
2015-03-26 8:41 ` Alexis
2015-03-26 8:58 ` Artur Malabarba
2015-03-26 10:27 ` Rasmus
2015-03-26 19:01 ` Ricardo Wurmus
2015-03-26 19:08 ` Rasmus
2015-03-26 23:41 ` Jonas Bernoulli
2015-04-01 20:41 ` Harald Hanche-Olsen
2015-04-03 11:00 ` Richard Stallman
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=83fv8qnbrk.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=monnier@iro.umontreal.ca \
--cc=sb@dod.no \
/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 public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).