* Petr Baudis <[EMAIL PROTECTED]> wrote:
> Dear diary, on Wed, Apr 20, 2005 at 09:01:57AM CEST, I got a letter
> where Ingo Molnar <[EMAIL PROTECTED]> told me that...
> > [...]
> > fatal: unable to execute 'gitmerge-file.sh'
> > fatal: merge program failed
>
> Pure stupidity of mine, I forgot to add gitmerge-file.sh to the list of
> scripts which get installed.
another thing is this annoying message:
rsync: link_stat "/linux/kernel/people/torvalds/git.git/tags" (in pub)
failed: No such file or directory (2)
rsync error: some files could not be transferred (code 23) at
main.c(812)
client: nothing to do: perhaps you need to specify some filenames or
the --recursive option?
you said before that it's "harmless", but it's annoying nevertheless as
one doesnt know for sure whether the pull went fine.
Ingo
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
