Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
gitmodules.5: url can be a relative path
[gitweb.git]
/
Documentation
/
git-checkout.txt
diff --git
a/Documentation/git-checkout.txt
b/Documentation/git-checkout.txt
index 7146288ad6b8a2bc8b44513e76d87cdb628827e9..7b831622239872b1567eada42fa03331a6b3494f 100644
(file)
--- a/
Documentation/git-checkout.txt
+++ b/
Documentation/git-checkout.txt
@@
-238,7
+238,7
@@
the above checkout would fail like this:
+
------------
$ git checkout mytopic
-
fatal: Entry 'frotz' not uptodate. Cannot merge
.
+
error: You have local changes to 'frotz'; not switching branches
.
------------
+
You can give the `-m` flag to the command, which would try a