checkout: accord documentation to what git does
Signed-off-by: Nicolas Sebrecht <nicolas.s.dev@gmx.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nicolas Sebrecht committed
Jul 9, 2010 at 22:27 UTC
142183d09634aa00a47107c7ffc5e39fa6cbf1b0
1 file changed
+1
-1
Documentation/git-checkout.txt
+1
-1
@@ -238,7 +238,7 @@ the above checkout would fail like this:
238
+
239
------------
240
$ git checkout mytopic
241
-fatal: Entry 'frotz' not uptodate. Cannot merge.
241
+error: You have local changes to 'frotz'; not switching branches.
242
------------
243
+
244
You can give the `-m` flag to the command, which would try a