From: Andreas Schwab <schwab@linux-m68k.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: Duy Nguyen <pclouds@gmail.com>, Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH] reset: --unmerge
Date: Thu, 27 Oct 2016 18:05:03 +0200 [thread overview]
Message-ID: <87d1il3hhs.fsf@linux-m68k.org> (raw)
In-Reply-To: <xmqqmvhsc8kn.fsf@gitster.mtv.corp.google.com> (Junio C. Hamano's message of "Tue, 25 Oct 2016 16:28:24 -0700")
On Okt 25 2016, Junio C Hamano <gitster@pobox.com> wrote:
> Somebody with a bright idea decided that vc-git-resolve-conflicts
> variable should be on by default in Emacs 25.1 X-<
This is consistent with the behaviour of the other VC backends, where it
isn't even customizable.
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
next prev parent reply other threads:[~2016-10-27 16:05 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-24 23:10 [PATCH] reset: --unmerge Junio C Hamano
2016-10-25 11:06 ` Duy Nguyen
2016-10-25 11:11 ` Duy Nguyen
2016-10-25 23:28 ` Junio C Hamano
2016-10-26 9:32 ` Duy Nguyen
2016-10-26 17:06 ` Junio C Hamano
2016-10-27 16:05 ` Andreas Schwab [this message]
2016-10-27 16:23 ` Junio C Hamano
2016-10-25 17:32 ` Sergey Organov
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: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87d1il3hhs.fsf@linux-m68k.org \
--to=schwab@linux-m68k.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@gmail.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://80x24.org/mirrors/git.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).