{"thread":{"id":"25551","subject":"How do I get a list of all unmerged files?","startedAt":"2010-10-26T14:32:45Z","lastAt":"2010-10-27T19:18:36Z","messageCount":8,"participants":["George Spelvin","Jay Soffian","Junio C Hamano","Gavin Guo","Eric Raible","Joshua Juran"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"154449","messageId":"20101026143245.11433.qmail@science.horizon.com","threadId":"25551","inReplyTo":null,"subject":"How do I get a list of all unmerged files?","fromName":"George Spelvin","fromEmail":"linux@horizon.com","sentAt":"2010-10-26T14:32:45Z","receivedAt":"2010-10-26T14:32:45Z","isPatch":false,"sender":{"key":"linux@horizon.com","avatar":null},"body":"After a merge with conflicts, mostly resolved by rerere, I want to pass a list of\nall unmerged files to the editor for manual review.\n\nI can see the list (wrapped in a bunch of inconvenient human-readable cruft)\nin \"git status\". I can also get a list (again with a bunch of extraneous\ninfo) from \"git ls-files -u\". What I can't figure out is how to get\n\"git ls-files -u\" with --stage turned *off*.\n\nI'm sure this exists somewhere, but I can't find it. Can someone enlighten\nme?\n\nvim `git command here`\n\nThank you.\n"},{"id":"154451","messageId":"AANLkTi=JipA6P72hY5_FSvohCruf8hqsJc8Rh53FzAzT@mail.gmail.com","threadId":"25551","inReplyTo":"20101026143245.11433.qmail@science.horizon.com","subject":"Re: How do I get a list of all unmerged files?","fromName":"Jay Soffian","fromEmail":"jaysoffian@gmail.com","sentAt":"2010-10-26T15:31:33Z","receivedAt":"2010-10-26T15:31:33Z","isPatch":false,"sender":{"key":"jaysoffian@gmail.com","avatar":"https://avatars.githubusercontent.com/u/155970?v=4"},"body":"On Tue, Oct 26, 2010 at 10:32 AM, George Spelvin wrote:\n> After a merge with conflicts, mostly resolved by rerere, I want to pass a list of\n> all unmerged files to the editor for manual review.\n>\n> I can see the list (wrapped in a bunch of inconvenient human-readable cruft)\n> in \"git status\".  I can also get a list (again with a bunch of extraneous\n> info) from \"git ls-files -u\".  What I can't figure out is how to get\n> \"git ls-files -u\" with --stage turned *off*.\n>\n> I'm sure this exists somewhere, but I can't find it.  Can someone enlighten\n> me?\n>\n> vim `git command here`\n\n$ git help unmerged\n`git unmerged' is aliased to `!git ls-files --unmerged | cut -f2 | uniq'\n\nIf there's a better way to do it, I don't know what it is.\n\nj.\n"},{"id":"154452","messageId":"7v1v7dhrc7.fsf@alter.siamese.dyndns.org","threadId":"25551","inReplyTo":"20101026143245.11433.qmail@science.horizon.com","subject":"Re: How do I get a list of all unmerged files?","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2010-10-26T16:05:44Z","receivedAt":"2010-10-26T16:05:44Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"George Spelvin\" writes:\n\n> After a merge with conflicts, mostly resolved by rerere, I want to pass a list of\n> all unmerged files to the editor for manual review.\n>\n> I can see the list (wrapped in a bunch of inconvenient human-readable cruft)\n> in \"git status\". I can also get a list (again with a bunch of extraneous\n> info) from \"git ls-files -u\". What I can't figure out is how to get\n> \"git ls-files -u\" with --stage turned *off*.\n\n\"rerere status\"?\n"},{"id":"154453","messageId":"AANLkTikthqc9xzJd0sDTXfVW6eGCNjZ0xpZuOmocFTt0@mail.gmail.com","threadId":"25551","inReplyTo":"7v1v7dhrc7.fsf@alter.siamese.dyndns.org","subject":"Re: How do I get a list of all unmerged files?","fromName":"Gavin Guo","fromEmail":"tuffkidtt@gmail.com","sentAt":"2010-10-26T16:23:02Z","receivedAt":"2010-10-26T16:23:02Z","isPatch":false,"sender":{"key":"tuffkidtt@gmail.com","avatar":null},"body":"2010/10/27 Junio C Hamano :\n> \"George Spelvin\" writes:\n>\n>> After a merge with conflicts, mostly resolved by rerere, I want to pass a list of\n>> all unmerged files to the editor for manual review.\n>>\n>> I can see the list (wrapped in a bunch of inconvenient human-readable cruft)\n>> in \"git status\".  I can also get a list (again with a bunch of extraneous\n>> info) from \"git ls-files -u\".  What I can't figure out is how to get\n>> \"git ls-files -u\" with --stage turned *off*.\n>\n> \"rerere status\"?\n\nI think it should be reset ?? or revert ??\n"},{"id":"154456","messageId":"4CC70A9B.4030801@nextest.com","threadId":"25551","inReplyTo":"20101026143245.11433.qmail@science.horizon.com","subject":"Re: How do I get a list of all unmerged files?","fromName":"Eric Raible","fromEmail":"raible@nextest.com","sentAt":"2010-10-26T17:06:35Z","receivedAt":"2010-10-26T17:06:35Z","isPatch":false,"sender":{"key":"raible@nextest.com","avatar":null},"body":"On 11:59 AM, George Spelvin wrote:\n> After a merge with conflicts, mostly resolved by rerere, I want to pass a list of\n> all unmerged files to the editor for manual review.\n> \n> I can see the list (wrapped in a bunch of inconvenient human-readable cruft)\n> in \"git status\". I can also get a list (again with a bunch of extraneous\n> info) from \"git ls-files -u\". What I can't figure out is how to get\n> \"git ls-files -u\" with --stage turned *off*.\n> \n> I'm sure this exists somewhere, but I can't find it. Can someone enlighten\n> me?\n> \n> vim `git command here`\n> \n> Thank you.\n\nIt's not exactly what you asked for but this might\ngive you what you want:\n\n\tgit config merge.tool vim\n\tgit mergetool\n\nHTH - Eric\n"},{"id":"154554","messageId":"4CC85AA2.1050406@nextest.com","threadId":"25551","inReplyTo":"AANLkTi=JipA6P72hY5_FSvohCruf8hqsJc8Rh53FzAzT@mail.gmail.com","subject":"Re: Re: How do I get a list of all unmerged files?","fromName":"Eric Raible","fromEmail":"raible@nextest.com","sentAt":"2010-10-27T17:00:18Z","receivedAt":"2010-10-27T17:00:18Z","isPatch":false,"sender":{"key":"raible@nextest.com","avatar":null},"body":"On 11:59 AM, Jay Soffian wrote:\n> $ git help unmerged\n> `git unmerged' is aliased to `!git ls-files --unmerged | cut -f2 | uniq'\n> \n> If there's a better way to do it, I don't know what it is.\n\nHow about: git diff --name-only | uniq\n"},{"id":"154565","messageId":"DD284F82-88E1-44D8-B2B7-C11ED9F3F7DE@gmail.com","threadId":"25551","inReplyTo":"4CC85AA2.1050406@nextest.com","subject":"Re: How do I get a list of all unmerged files?","fromName":"Joshua Juran","fromEmail":"jjuran@gmail.com","sentAt":"2010-10-27T18:39:02Z","receivedAt":"2010-10-27T18:39:02Z","isPatch":false,"sender":{"key":"jjuran@gmail.com","avatar":null},"body":"On Oct 27, 2010, at 10:00 AM, Eric Raible wrote:\n\n> On 11:59 AM, Jay Soffian wrote:\n>> $ git help unmerged\n>> `git unmerged' is aliased to `!git ls-files --unmerged | cut -f2 | \n>> uniq'\n>>\n>> If there's a better way to do it, I don't know what it is.\n>\n> How about: git diff --name-only | uniq\n\nI use `git diff --stat`, via alias `git ds`.\n\nJosh\n"},{"id":"154568","messageId":"4CC87B0C.8020906@nextest.com","threadId":"25551","inReplyTo":"4CC85AA2.1050406@nextest.com","subject":"Re: Re: Re: How do I get a list of all unmerged files?","fromName":"Eric Raible","fromEmail":"raible@nextest.com","sentAt":"2010-10-27T19:18:36Z","receivedAt":"2010-10-27T19:18:36Z","isPatch":false,"sender":{"key":"raible@nextest.com","avatar":null},"body":"On 11:59 AM, Eric Raible wrote:\n> On 11:59 AM, Jay Soffian wrote:\n>> $ git help unmerged\n>> `git unmerged' is aliased to `!git ls-files --unmerged | cut -f2 | uniq'\n>>\n>> If there's a better way to do it, I don't know what it is.\n> \n> How about: git diff --name-only | uniq\n\nOr even better: git diff --name-only --diff-filter=U\n"}]}