{"thread":{"id":"24322","subject":"git status / ls-files","startedAt":"2010-07-07T20:31:54Z","lastAt":"2010-07-08T10:06:22Z","messageCount":2,"participants":["Mahesh Vaidya","Michael J Gruber"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"145051","messageId":"AANLkTikdA7CEY19bYHIxIsPezaZZo-SrEaSupi2UoRNS@mail.gmail.com","threadId":"24322","inReplyTo":null,"subject":"git status / ls-files","fromName":"Mahesh Vaidya","fromEmail":"forvaidya@gmail.com","sentAt":"2010-07-07T20:31:54Z","receivedAt":"2010-07-07T20:31:54Z","isPatch":false,"sender":{"key":"forvaidya@gmail.com","avatar":null},"body":"Hi\n\nIs there a query command which I can run on my workspace which will\ngive output of following style. (in the same that of command\ngit merge foo  givesO\n\nI have examined git-lsfiles ; git log ; git-status didn't get output\nin following style\n\n\nAuto-merging nv/aaad/aaad_utils.c\nAuto-merging nv/aaad/include/aaad_session_private.h\nCONFLICT (content): Merge conflict in nv/aaad/include/aaad_session_private.h\nAuto-merging nv/aaad/test/session_authen_test.c\nCONFLICT (content): Merge conflict in nv/aaad/test/session_authen_test.c\n\n\n-- \nThank you and best regards.\nMahesh Vaidya  / 9740500144\nhttp://www.twitter.com/forvaidya\n"},{"id":"145105","messageId":"4C35A31E.2040800@drmicha.warpmail.net","threadId":"24322","inReplyTo":"AANLkTikdA7CEY19bYHIxIsPezaZZo-SrEaSupi2UoRNS@mail.gmail.com","subject":"Re: git status / ls-files","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2010-07-08T10:06:22Z","receivedAt":"2010-07-08T10:06:22Z","isPatch":false,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Mahesh Vaidya venit, vidit, dixit 07.07.2010 22:31:\n> Hi\n> \n> Is there a query command which I can run on my workspace which will\n> give output of following style. (in the same that of command\n> git merge foo  givesO\n> \n> I have examined git-lsfiles ; git log ; git-status didn't get output\n> in following style\n> \n> \n> Auto-merging nv/aaad/aaad_utils.c\n> Auto-merging nv/aaad/include/aaad_session_private.h\n> CONFLICT (content): Merge conflict in nv/aaad/include/aaad_session_private.h\n> Auto-merging nv/aaad/test/session_authen_test.c\n> CONFLICT (content): Merge conflict in nv/aaad/test/session_authen_test.c\n> \n\nYou can get this info only by attempting a merge, but you an avoid the\nmerge commit with\n\ngit merge --no-commit\n\nSo, maybe \"git merge --no-commit foo; git reset --hard\"?\n\nOr do you want that info (again) right after a failed merge, during the\nconflict resolution?\n\nMichael\n"}]}