Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Do not scramble password read from .cvspass
[gitweb.git]
/
Documentation
/
git-checkout.txt
diff --git
a/Documentation/git-checkout.txt
b/Documentation/git-checkout.txt
index ad4b31e89218e857001fce69f32acbe85fc7539c..b1314b561435029bb6fa468629cf71d9e3cad08a 100644
(file)
--- a/
Documentation/git-checkout.txt
+++ b/
Documentation/git-checkout.txt
@@
-45,9
+45,11
@@
file can be discarded to recreate the original conflicted merge result.
OPTIONS
-------
-q::
+--quiet::
Quiet, suppress feedback messages.
-f::
+--force::
When switching branches, proceed even if the index or the
working tree differs from HEAD. This is used to throw away
local changes.