From: Eli Zaretskii <eliz@gnu.org>
To: Dmitry Gutov <dgutov@yandex.ru>
Cc: alexharsanyi@gmail.com, tom@tromey.com, sorganov@gmail.com,
emacs-devel@gnu.org
Subject: Re: vc-dir operation is very slow on large git repositories in Emacs 26.1
Date: Thu, 28 Jun 2018 16:12:40 +0300 [thread overview]
Message-ID: <83fu17oy0n.fsf@gnu.org> (raw)
In-Reply-To: <144beaa1-0989-b8f3-126a-6a6525d1b219@yandex.ru> (message from Dmitry Gutov on Thu, 28 Jun 2018 16:06:27 +0300)
> Cc: alexharsanyi@gmail.com, tom@tromey.com, sorganov@gmail.com,
> emacs-devel@gnu.org
> From: Dmitry Gutov <dgutov@yandex.ru>
> Date: Thu, 28 Jun 2018 16:06:27 +0300
>
> -u limits the output to unmerged files only.
>
> So the question here is whether "unmerged" covers all files we want to
> assign the "conflict" status to. I think it does.
Yes, and I still don't think I understand what "unmerged" means in
this context. Can you explain? To me, "merging" only has meaning
when more than one branch is considered, or two instances of a single
branch that diverged.
next prev parent reply other threads:[~2018-06-28 13:12 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-20 10:50 vc-dir operation is very slow on large git repositories in Emacs 26.1 Alex Harsanyi
2018-06-20 15:51 ` Eli Zaretskii
2018-06-20 22:33 ` Alex Harsanyi
2018-06-21 14:32 ` Eli Zaretskii
2018-06-22 1:12 ` Alex Harsanyi
2018-06-22 8:57 ` Eli Zaretskii
2018-06-22 9:46 ` Alex Harsanyi
2018-06-22 12:46 ` Alex Harsanyi
2018-06-22 18:24 ` Eli Zaretskii
2018-06-22 20:43 ` w32-pipe-read-delay (was: vc-dir operation is very slow on large git repositories in Emacs 26.1) Stefan Monnier
2018-06-23 7:21 ` Eli Zaretskii
[not found] ` <CAH-ciFrCk=pVTDUA+8F1XZSK40Wr21yzz3u=mutJ0NM3UdojNw@mail.gmail.com>
2018-06-23 13:30 ` Fwd: " Alex Harsanyi
2018-06-23 13:32 ` Alex Harsanyi
2018-06-23 13:40 ` Eli Zaretskii
2018-06-23 14:00 ` Alex Harsanyi
2018-06-23 14:31 ` Eli Zaretskii
2018-06-30 8:46 ` Eli Zaretskii
2018-06-25 10:40 ` vc-dir operation is very slow on large git repositories in Emacs 26.1 Alex Harsanyi
2018-06-25 11:09 ` Bastian Beischer
2018-06-25 12:23 ` Alex Harsanyi
2018-06-25 15:17 ` Eli Zaretskii
2018-06-25 15:44 ` Bastian Beischer
2018-06-25 16:23 ` Eli Zaretskii
2018-06-25 22:28 ` Alex Harsanyi
2018-06-25 14:51 ` Eli Zaretskii
2018-06-22 9:04 ` Dmitry Gutov
2018-06-23 13:37 ` Eli Zaretskii
2018-06-23 18:28 ` Dmitry Gutov
2018-06-23 18:44 ` Eli Zaretskii
2018-06-25 12:55 ` Dmitry Gutov
2018-06-25 15:20 ` Eli Zaretskii
2018-06-26 15:14 ` Sergey Organov
2018-06-27 2:01 ` Dmitry Gutov
2018-06-27 2:49 ` Tom Tromey
2018-06-27 9:41 ` Dmitry Gutov
2018-06-27 15:12 ` Eli Zaretskii
2018-06-28 0:30 ` Dmitry Gutov
2018-06-28 12:55 ` Eli Zaretskii
2018-06-28 13:06 ` Dmitry Gutov
2018-06-28 13:12 ` Eli Zaretskii [this message]
2018-06-28 13:18 ` Dmitry Gutov
2018-06-28 13:38 ` Eli Zaretskii
2018-06-28 13:47 ` Dmitry Gutov
2018-06-28 14:00 ` Eli Zaretskii
2018-06-28 13:21 ` Sergey Organov
2018-06-28 13:28 ` Dmitry Gutov
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=83fu17oy0n.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=alexharsanyi@gmail.com \
--cc=dgutov@yandex.ru \
--cc=emacs-devel@gnu.org \
--cc=sorganov@gmail.com \
--cc=tom@tromey.com \
/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).