From: Gavin Guo <tuffkidtt@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: George Spelvin <linux@horizon.com>, git@vger.kernel.org
Subject: Re: How do I get a list of all unmerged files?
Date: Wed, 27 Oct 2010 00:23:02 +0800 [thread overview]
Message-ID: <AANLkTikthqc9xzJd0sDTXfVW6eGCNjZ0xpZuOmocFTt0@mail.gmail.com> (raw)
In-Reply-To: <7v1v7dhrc7.fsf@alter.siamese.dyndns.org>
2010/10/27 Junio C Hamano <gitster@pobox.com>:
> "George Spelvin" <linux@horizon.com> writes:
>
>> 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*.
>
> "rerere status"?
I think it should be reset ?? or revert ??
next prev parent reply other threads:[~2010-10-26 16:23 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 [this message]
2010-10-26 17:06 ` Eric Raible
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=AANLkTikthqc9xzJd0sDTXfVW6eGCNjZ0xpZuOmocFTt0@mail.gmail.com \
--to=tuffkidtt@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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 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).