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: it's confusing that during 'git pull', the rsync output
> is not visible. Especially during large rsyncs, it would be nice to see
> some progress. So i usually use a raw rsync not 'git pull', due to this.
Fixed. For further reference, you can also set RSYNC_FLAGS and put
whatever pleases you there.
> yet another thing: what is the canonical 'pasky way' of simply nuking
> the current files and checking out the latest tree (according to
> .git/HEAD). Right now i'm using a script to:
> read-tree $(tree-id $(cat .git/HEAD))
> checkout-cache -a
> (i first do an 'rm -f *' in the working directory)
> i guess there's an existing command for this already?
Petr "Pasky" Baudis
C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor
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