lördag 20 december 2008 07:53:38 skrev Jeff King: > On Sat, Dec 20, 2008 at 12:35:06AM +0100, Johannes Schindelin wrote: > > > Commit notes are blobs which are shown together with the commit > > message. These blobs are taken from the notes ref, which you can > > configure by the config variable core.notesRef, which in turn can > > be overridden by the environment variable GIT_NOTES_REF. > > Hmm. I wanted to try some performance comparisons based on this > implementation, but I can't get your 1/4 to apply. Conflicts in > config.txt and cache.h when applying to master, and "sha1 information is > lacking or useless" for a 3-way merge. What did you base this on? patch(1) however can crunch it, with the exception of cache.h. Shouldn't git am/appy and patch agree on git generated patches (without binary diffs)? -- robin -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
