mirror of
https://github.com/git/git
synced 2024-09-12 21:04:12 +00:00
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>
This commit is contained in:
parent
cb1881c6ee
commit
40c8279f9b
|
@ -23,9 +23,9 @@ options, which will be passed to `git branch`.
|
||||||
|
|
||||||
When <paths> are given, this command does *not* switch
|
When <paths> are given, this command does *not* switch
|
||||||
branches. It updates the named paths in the working tree from
|
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
|
the index file (i.e. it runs `git-checkout-index -f -u`), or
|
||||||
named commit. In
|
from a named commit. In
|
||||||
this case, `-f` and `-b` options are meaningless and giving
|
this case, the `-f` and `-b` options are meaningless and giving
|
||||||
either of them results in an error. <tree-ish> argument can be
|
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)
|
used to specify a specific tree-ish (i.e. commit, tag or tree)
|
||||||
to update the index for the given paths before updating the
|
to update the index for the given paths before updating the
|
||||||
|
@ -38,7 +38,8 @@ OPTIONS
|
||||||
Quiet, supress feedback messages.
|
Quiet, supress feedback messages.
|
||||||
|
|
||||||
-f::
|
-f::
|
||||||
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.
|
||||||
|
|
||||||
-b::
|
-b::
|
||||||
Create a new branch named <new_branch> and start it at
|
Create a new branch named <new_branch> and start it at
|
||||||
|
|
Loading…
Reference in a new issue