From: Noam Postavsky <npostavs@gmail.com>
To: David Engster <deng@randomsample.de>
Cc: Glenn Morris <rgm@gnu.org>, Emacs developers <emacs-devel@gnu.org>
Subject: Re: Resuming M-x gitmerge
Date: Mon, 18 Jun 2018 20:27:57 -0400 [thread overview]
Message-ID: <CAM-tV-_h-=dPCarJMGcxp7=JQ==VX9-5AxF-1tTaW0PMRCPeFg@mail.gmail.com> (raw)
In-Reply-To: <CAM-tV-_39CGDNffVqiFbGLAq_0nvXF5Jc8SJkQLut4op_chsMA@mail.gmail.com>
On 11 June 2018 at 20:48, Noam Postavsky <npostavs@gmail.com> wrote:
> Oh, I see what it is. The reason it doesn't work for me is that I use
> git-worktree, so the .git/MERGE_HEAD test gives the wrong answer. And
> now I see that gitmerge-resolve does actually do 'git add' if needed,
> so the current message is actually perfectly fine. The attached lets
> it work for me, I think that should cover everything.
Pushed to master.
[1: 5498acb5a2]: 2018-06-18 20:02:04 -0400
Stop assuming .git is a directory in gitmerge.el
https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=5498acb5a2b4a19060d17c0e2ce0aec36ee684f9
prev parent reply other threads:[~2018-06-19 0:27 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-10 23:54 Resuming M-x gitmerge Noam Postavsky
2018-06-11 2:37 ` Eli Zaretskii
2018-06-11 6:54 ` João Távora
2018-06-11 12:40 ` Noam Postavsky
2018-06-11 15:30 ` Eli Zaretskii
2018-06-11 15:46 ` Stefan Monnier
2018-06-11 16:00 ` Eli Zaretskii
2018-06-11 16:14 ` Noam Postavsky
2018-06-11 15:50 ` Glenn Morris
2018-06-11 16:12 ` Noam Postavsky
2018-06-11 18:18 ` Glenn Morris
2018-06-11 19:31 ` David Engster
2018-06-12 0:48 ` Noam Postavsky
2018-06-19 0:27 ` Noam Postavsky [this message]
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='CAM-tV-_h-=dPCarJMGcxp7=JQ==VX9-5AxF-1tTaW0PMRCPeFg@mail.gmail.com' \
--to=npostavs@gmail.com \
--cc=deng@randomsample.de \
--cc=emacs-devel@gnu.org \
--cc=rgm@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 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).