@matheusbsbs / matheus-bagliano / commits / 40c8279f9b
Fork 0

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" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>

J. Bruce Fields committed Apr 16, 2007 at 00:37 UTC 40c8279f9b4f1c37f5e994c1c053b69446133559
1 file changed +5 -4
Documentation/git-checkout.txt
+5 -4
@@ -23,9 +23,9 @@ options, which will be passed to `git branch`.
23
24 When <paths> are given, this command does *not* switch
25 branches. It updates the named paths in the working tree from
26 -the index file (i.e. it runs `git-checkout-index -f -u`), or a
27 -named commit. In
28 -this case, `-f` and `-b` options are meaningless and giving
26 +the index file (i.e. it runs `git-checkout-index -f -u`), or
27 +from a named commit. In
28 +this case, the `-f` and `-b` options are meaningless and giving
29 either of them results in an error. <tree-ish> argument can be
30 used to specify a specific tree-ish (i.e. commit, tag or tree)
31 to update the index for the given paths before updating the
@@ -38,7 +38,8 @@ OPTIONS
38 Quiet, supress feedback messages.
39
40 -f::
41 - Force a re-read of everything.
41 + Proceed even if the index or the working tree differs
42 + from HEAD. This is used to throw away local changes.
43
44 -b::
45 Create a new branch named <new_branch> and start it at