Re: [GIT PATCH] I2C and W1 bugfixes for 2.6.12-rc2
- From
Petr Baudis <pasky@ucw.cz>
- Date
- Apr 19, 2005, 22:58 UTC
- Message-ID
- <20050419225830.GH9305@pasky.ji.cz>
- In-Reply-To
- <7vpswqpes1.fsf@assigned-by-dhcp.cox.net>
Dear diary, on Wed, Apr 20, 2005 at 12:45:02AM CEST, I got a letter where Junio C Hamano <junkio@cox.net> told me that...
Show 16 quoted lines
> >>>>> "PB" == Petr Baudis <pasky@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