From: Alexandre Julliard <julliard@winehq.org>
To: Martin Nordholts <martin@chromecode.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] git.el: Make it easy to add unmerged files
Date: Sun, 30 Aug 2009 17:58:53 +0200 [thread overview]
Message-ID: <87ws4l47k2.fsf@wine.dyndns.org> (raw)
In-Reply-To: <4A9A92F4.2090209@chromecode.com> (Martin Nordholts's message of "Sun, 30 Aug 2009 16:55:48 +0200")
Martin Nordholts <martin@chromecode.com> writes:
> (Resending as I managed to mangle the previous patch despite trying not to...)
>
> It is nice and easy to git-add ignored and unknown files in a
> git-status buffer. Make it equally easy to add unmerged files which is
> a common use case.
That's not quite what adding a file means in git.el, unmerged files are
considered added already, and marking them resolved is done through the
git-resolve-file command. Of course that was implemented before git
overloaded the meaning of git-add to mean git-update-index, so maybe we
should follow the trend and use git-add-file for all index updates. In
that case git-resolve-file should probably be removed.
--
Alexandre Julliard
julliard@winehq.org
next prev parent reply other threads:[~2009-08-30 15:59 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-30 14:55 [PATCH] git.el: Make it easy to add unmerged files Martin Nordholts
2009-08-30 15:58 ` Alexandre Julliard [this message]
2009-09-02 5:48 ` Martin Nordholts
2009-09-02 8:48 ` Alexandre Julliard
-- strict thread matches above, loose matches on Subject: below --
2009-08-30 14:35 Martin Nordholts
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=87ws4l47k2.fsf@wine.dyndns.org \
--to=julliard@winehq.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=martin@chromecode.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.