* git status / ls-files
@ 2010-07-07 20:31 Mahesh Vaidya
2010-07-08 10:06 ` Michael J Gruber
0 siblings, 1 reply; 2+ messages in thread
From: Mahesh Vaidya @ 2010-07-07 20:31 UTC (permalink / raw)
To: git
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: git status / ls-files
2010-07-07 20:31 git status / ls-files Mahesh Vaidya
@ 2010-07-08 10:06 ` Michael J Gruber
0 siblings, 0 replies; 2+ messages in thread
From: Michael J Gruber @ 2010-07-08 10:06 UTC (permalink / raw)
To: Mahesh Vaidya; +Cc: git
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-07-08 10:07 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-07-07 20:31 git status / ls-files Mahesh Vaidya
2010-07-08 10:06 ` Michael J Gruber
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.