From: Alexandre Julliard <julliard@winehq.org>
To: Martin Nordholts <enselic@gmail.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] git.el: Use git-add-file for unmerged files, remove git-resolve-file
Date: Tue, 08 Sep 2009 20:43:38 +0200 [thread overview]
Message-ID: <873a6x9t0l.fsf@wine.dyndns.org> (raw)
In-Reply-To: <4AA026AC.10907@gmail.com> (Martin Nordholts's message of "Thu, 03 Sep 2009 22:27:24 +0200")
Martin Nordholts <enselic@gmail.com> writes:
> Use `git-add-file' to mark unmerged files as resolved in the
> *git-status* buffer to be consistent with git's CLI instructions. Also
> remove `git-resolve-file' to make it clear that that "R" is a now a
> free keybinding.
>
> Signed-off-by: Martin Nordholts <martinn@src.gnome.org>
Looks good, thanks.
Acked-by: Alexandre Julliard <julliard@winehq.org>
--
Alexandre Julliard
julliard@winehq.org
next prev parent reply other threads:[~2009-09-08 18:43 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-03 20:27 [PATCH] git.el: Use git-add-file for unmerged files, remove git-resolve-file Martin Nordholts
2009-09-08 18:43 ` Alexandre Julliard [this message]
2009-09-08 20:43 ` Junio C Hamano
2009-09-08 23:10 ` Junio C Hamano
2009-09-09 16:09 ` Alexandre Julliard
2009-09-09 19:10 ` Junio C Hamano
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=873a6x9t0l.fsf@wine.dyndns.org \
--to=julliard@winehq.org \
--cc=enselic@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
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 NNTP newsgroup(s).