Dear diary, on Fri, Jul 28, 2006 at 06:48:49AM CEST, I got a letter where Junio C Hamano <junkio@cox.net> said that... > Petr Baudis <pasky@suse.cz> writes: > > Well, at once? I can do (iv) by adding --index but that contradicts (v). > > But maybe I'm missing something. > > What should the semantics of such operation be? Apply to index > on paths that are clean while leave the index entries untouched > for paths that are dirty? What should happen on renamed paths > that are dirty? Keep the original sha1 but change the name. If an entry with the new name already exists, we might just leave the index alone and create a .rej file. (Alternatively we might create two stages in the index file but we can't do that in case of regular rejects so I'd rather stay consistent.) -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ Snow falling on Perl. White noise covering line noise. Hides all the bugs too. -- J. Putnam - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.htmlReceived on Sat Jul 29 01:47:54 2006
This archive was generated by hypermail 2.1.8 : 2006-07-29 01:48:54 EST