J. Bruce Fields  committed 40c8279

Documentation: clarify git-checkout -f, minor editing

"Force a re-read of everything" doesn't mean much to me.

Also some minor grammar fixes.

Signed-off-by: "J. Bruce Fields" <>
Signed-off-by: Junio C Hamano <>

  • Participants
  • Parent commits cb1881c

Comments (0)

Files changed (1)

File Documentation/git-checkout.txt

 When <paths> are given, this command does *not* switch
 branches.  It updates the named paths in the working tree from
-the index file (i.e. it runs `git-checkout-index -f -u`), or a
-named commit.  In
-this case, `-f` and `-b` options are meaningless and giving
+the index file (i.e. it runs `git-checkout-index -f -u`), or
+from a named commit.  In
+this case, the `-f` and `-b` options are meaningless and giving
 either of them results in an error.  <tree-ish> argument can be
 used to specify a specific tree-ish (i.e. commit, tag or tree)
 to update the index for the given paths before updating the
 	Quiet, supress feedback messages.
-	Force a re-read of everything.
+	Proceed even if the index or the working tree differs
+	from HEAD.  This is used to throw away local changes.
 	Create a new branch named <new_branch> and start it at