Dear diary, on Wed, Apr 20, 2005 at 12:45:02AM CEST, I got a letter where Junio C Hamano <junkio at cox.net> told me that... > >>>>> "PB" == Petr Baudis <pasky at ucw.cz> writes: > > PB> I'm wondering if doing > > PB> if [ "$(show-diff)" ]; then > PB> git diff | git apply > PB> else > PB> checkout-cache -f -a > PB> fi > > PB> would actually buy us some time; or, how common is it for people to have > PB> no local changes whatsoever, and whether relative slowdown of additional > PB> show-diff to git diff would actually matter. > > "show-diff -s" perhaps. Also wouldn't it be faster to pipe > show-diff output (not git diff output) to patch (not git apply)? Excellent idea, thanks. Changed git merge to do this. -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor
