* How do I get a list of all unmerged files?
@ 2010-10-26 14:32 George Spelvin
2010-10-26 15:31 ` Jay Soffian
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: George Spelvin @ 2010-10-26 14:32 UTC (permalink / raw)
To: git; +Cc: linux
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.
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: How do I get a list of all unmerged files?
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-26 16:05 ` Junio C Hamano
2010-10-26 17:06 ` Eric Raible
2 siblings, 1 reply; 8+ messages in thread
From: Jay Soffian @ 2010-10-26 15:31 UTC (permalink / raw)
To: George Spelvin; +Cc: git
On Tue, Oct 26, 2010 at 10:32 AM, George Spelvin <linux@horizon.com> 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`
$ git help unmerged
`git unmerged' is aliased to `!git ls-files --unmerged | cut -f2 | uniq'
If there's a better way to do it, I don't know what it is.
j.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: Re: How do I get a list of all unmerged files?
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
0 siblings, 2 replies; 8+ messages in thread
From: Eric Raible @ 2010-10-27 17:00 UTC (permalink / raw)
To: Jay Soffian; +Cc: George Spelvin, git
On 11:59 AM, Jay Soffian wrote:
> $ git help unmerged
> `git unmerged' is aliased to `!git ls-files --unmerged | cut -f2 | uniq'
>
> If there's a better way to do it, I don't know what it is.
How about: git diff --name-only | uniq
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: How do I get a list of all unmerged files?
2010-10-27 17:00 ` Eric Raible
@ 2010-10-27 18:39 ` Joshua Juran
2010-10-27 19:18 ` Re: " Eric Raible
1 sibling, 0 replies; 8+ messages in thread
From: Joshua Juran @ 2010-10-27 18:39 UTC (permalink / raw)
To: Eric Raible; +Cc: Jay Soffian, George Spelvin, git
On Oct 27, 2010, at 10:00 AM, Eric Raible wrote:
> On 11:59 AM, Jay Soffian wrote:
>> $ git help unmerged
>> `git unmerged' is aliased to `!git ls-files --unmerged | cut -f2 |
>> uniq'
>>
>> If there's a better way to do it, I don't know what it is.
>
> How about: git diff --name-only | uniq
I use `git diff --stat`, via alias `git ds`.
Josh
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: Re: Re: How do I get a list of all unmerged files?
2010-10-27 17:00 ` Eric Raible
2010-10-27 18:39 ` Joshua Juran
@ 2010-10-27 19:18 ` Eric Raible
1 sibling, 0 replies; 8+ messages in thread
From: Eric Raible @ 2010-10-27 19:18 UTC (permalink / raw)
To: Eric Raible; +Cc: Jay Soffian, George Spelvin, git
On 11:59 AM, Eric Raible wrote:
> On 11:59 AM, Jay Soffian wrote:
>> $ git help unmerged
>> `git unmerged' is aliased to `!git ls-files --unmerged | cut -f2 | uniq'
>>
>> If there's a better way to do it, I don't know what it is.
>
> How about: git diff --name-only | uniq
Or even better: git diff --name-only --diff-filter=U
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: How do I get a list of all unmerged files?
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-26 16:05 ` Junio C Hamano
2010-10-26 16:23 ` Gavin Guo
2010-10-26 17:06 ` Eric Raible
2 siblings, 1 reply; 8+ messages in thread
From: Junio C Hamano @ 2010-10-26 16:05 UTC (permalink / raw)
To: George Spelvin; +Cc: git
"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"?
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: How do I get a list of all unmerged files?
2010-10-26 16:05 ` Junio C Hamano
@ 2010-10-26 16:23 ` Gavin Guo
0 siblings, 0 replies; 8+ messages in thread
From: Gavin Guo @ 2010-10-26 16:23 UTC (permalink / raw)
To: Junio C Hamano; +Cc: George Spelvin, git
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 ??
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: How do I get a list of all unmerged files?
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-26 16:05 ` Junio C Hamano
@ 2010-10-26 17:06 ` Eric Raible
2 siblings, 0 replies; 8+ messages in thread
From: Eric Raible @ 2010-10-26 17:06 UTC (permalink / raw)
To: George Spelvin; +Cc: git
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
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2010-10-27 19:18 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 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).