Re: How do I get a list of all unmerged files?

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



2010/10/27 Junio C Hamano <gitster@xxxxxxxxx>:
> "George Spelvin" <linux@xxxxxxxxxxx> 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 ??
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]