Hi, On Fri, 29 Jun 2007, しらいしななこ wrote: > A trouble I am seeing is that there are large hexadecimal string after > these markers, like this: > > <<<<<<< 13bd5d46b4a5d4ef44c53fab11e74801c18b16d0:A > side > revision > ======= > local > modification > >>>>>>> 9aa4ad6a3bdf5340bed969f6e14abb4e07e794f7:A > > I do not know what object these are, and I do not think it is useful to > show them to the user. I want them to say something more useful. > > [...] > > How do I tell merge-recursive to do that? I tried to read the > documentation for merge-recursive but there is no manual page. Yes, it is unfortunately undocumented. To override the name for a given SHA-1 (which is the long hex string, and which you can obtain by "git-rev-parse <commit>"), set the environment variable GITHEAD_<sha1>="This is a much nicer message" IOW If you would have done this (_before_ calling merge-recursive): export GITHEAD_9aa4ad6a3bdf5340bed969f6e14abb4e07e794f7=nanako then the last conflict marker would have read >>>>>>> nanako:A Hth, Dscho
