* gitk: showing onging merge as such ?
@ 2009-05-07 11:46 Yann Dirson
0 siblings, 0 replies; only message in thread
From: Yann Dirson @ 2009-05-07 11:46 UTC (permalink / raw)
To: git
While resolving a conflicted merge, I wondered if there was any reason why
gitk does not show that we are indeed doing a merge, by showing the staged
contents as a merge commit if MERGE_HEAD is found.
Is there any reason why we would not do this ?
I had a quick try at how this could be done, here it is. The diff is not
yet displayed as combined.
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-05-07 11:57 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-05-07 11:46 gitk: showing onging merge as such ? Yann Dirson
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).