From: Eric Raible <raible@nextest.com>
To: George Spelvin <linux@horizon.com>
Cc: <git@vger.kernel.org>
Subject: Re: How do I get a list of all unmerged files?
Date: Tue, 26 Oct 2010 10:06:35 -0700 [thread overview]
Message-ID: <4CC70A9B.4030801@nextest.com> (raw)
In-Reply-To: <20101026143245.11433.qmail@science.horizon.com>
On 11:59 AM, George Spelvin wrote:
> After a merge with conflicts, mostly resolved by rerere, I want to pass a list of
> all unmerged files to the editor for manual review.
>
> I can see the list (wrapped in a bunch of inconvenient human-readable cruft)
> in "git status". I can also get a list (again with a bunch of extraneous
> info) from "git ls-files -u". What I can't figure out is how to get
> "git ls-files -u" with --stage turned *off*.
>
> I'm sure this exists somewhere, but I can't find it. Can someone enlighten
> me?
>
> vim `git command here`
>
> Thank you.
It's not exactly what you asked for but this might
give you what you want:
git config merge.tool vim
git mergetool
HTH - Eric
prev parent reply other threads:[~2010-10-26 17:06 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-26 14:32 How do I get a list of all unmerged files? George Spelvin
2010-10-26 15:31 ` Jay Soffian
2010-10-27 17:00 ` Eric Raible
2010-10-27 18:39 ` Joshua Juran
2010-10-27 19:18 ` Re: " Eric Raible
2010-10-26 16:05 ` Junio C Hamano
2010-10-26 16:23 ` Gavin Guo
2010-10-26 17:06 ` Eric Raible [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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4CC70A9B.4030801@nextest.com \
--to=raible@nextest.com \
--cc=git@vger.kernel.org \
--cc=linux@horizon.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.