summaryrefslogtreecommitdiff
path: root/Documentation/git-checkout.txt
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@citi.umich.edu>2007-04-16 04:37:11 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-04-16 08:10:28 (GMT)
commit40c8279f9b4f1c37f5e994c1c053b69446133559 (patch)
tree7b34344728161f6f51f2b243f3910504752dd190 /Documentation/git-checkout.txt
parentcb1881c6eeb021102a7a0ae87dbddfd52bf1f04f (diff)
downloadgit-40c8279f9b4f1c37f5e994c1c053b69446133559.zip
git-40c8279f9b4f1c37f5e994c1c053b69446133559.tar.gz
git-40c8279f9b4f1c37f5e994c1c053b69446133559.tar.bz2
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>
Diffstat (limited to 'Documentation/git-checkout.txt')
-rw-r--r--Documentation/git-checkout.txt9
1 files changed, 5 insertions, 4 deletions
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index f5b2d50..b889688 100644
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -23,9 +23,9 @@ options, which will be passed to `git branch`.
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
@@ -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. This is used to throw away local changes.
-b::
Create a new branch named <new_branch> and start it at