# git status / ls-files 2 messages from 2010-07-07 to 2010-07-08. Participants: Mahesh Vaidya, Michael J Gruber. Thread: https://gitlist.dev/t/24322 ## Mahesh Vaidya, 2010-07-07 20:31 Subject: git status / ls-files Message-ID: URL: https://gitlist.dev/e/AANLkTikdA7CEY19bYHIxIsPezaZZo-SrEaSupi2UoRNS%40mail.gmail.com ``` Hi Is there a query command which I can run on my workspace which will give output of following style. (in the same that of command git merge foo givesO I have examined git-lsfiles ; git log ; git-status didn't get output in following style Auto-merging nv/aaad/aaad_utils.c Auto-merging nv/aaad/include/aaad_session_private.h CONFLICT (content): Merge conflict in nv/aaad/include/aaad_session_private.h Auto-merging nv/aaad/test/session_authen_test.c CONFLICT (content): Merge conflict in nv/aaad/test/session_authen_test.c -- Thank you and best regards. Mahesh Vaidya / 9740500144 http://www.twitter.com/forvaidya ``` ## Michael J Gruber, 2010-07-08 10:06 Subject: Re: git status / ls-files Message-ID: <4C35A31E.2040800@drmicha.warpmail.net> URL: https://gitlist.dev/e/4C35A31E.2040800%40drmicha.warpmail.net In-Reply-To: ``` Mahesh Vaidya venit, vidit, dixit 07.07.2010 22:31: > Hi > > Is there a query command which I can run on my workspace which will > give output of following style. (in the same that of command > git merge foo givesO > > I have examined git-lsfiles ; git log ; git-status didn't get output > in following style > > > Auto-merging nv/aaad/aaad_utils.c > Auto-merging nv/aaad/include/aaad_session_private.h > CONFLICT (content): Merge conflict in nv/aaad/include/aaad_session_private.h > Auto-merging nv/aaad/test/session_authen_test.c > CONFLICT (content): Merge conflict in nv/aaad/test/session_authen_test.c > You can get this info only by attempting a merge, but you an avoid the merge commit with git merge --no-commit So, maybe "git merge --no-commit foo; git reset --hard"? Or do you want that info (again) right after a failed merge, during the conflict resolution? Michael ```