From: J. Bruce Fields Date: Tue, 17 Apr 2007 13:58:12 GMT Subject: Re: [PATCH 2/7] Documentation: clarify git-checkout -f, minor editing Message-ID: <20070417135812.GE11907@fieldses.org> In-Reply-To: <7v4pngyk9n.fsf@assigned-by-dhcp.cox.net> On Sun, Apr 15, 2007 at 10:13:08PM -0700, Junio C Hamano wrote: > "J. Bruce Fields" writes: > > > "Force a re-read of everything" doesn't mean much to me. > > > > @@ -38,7 +38,8 @@ OPTIONS > > Quiet, supress feedback messages. > > > > -f:: > > - Force a re-read of everything. > > + Proceed even if the index or the working tree differs > > + from HEAD. > > > > While this is definitely better, I think it still is not clear > why the command needs an option to proceed. > > Not proceeding is about preventing local changes from getting > lost, and the option is a way to allow it to overwrite and lose > any local change. OK, I agree; does the patch in the following message look like an improvement? > Other than that, and your "From: " line (did you change your > config or switch machines?) Whoops, yes, I was sloppy about setting up a new laptop--apologies. > on the first three commits, I find all the changes very sensible. Thanks.--b.