aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Sebrecht <nicolas.s.dev@gmx.fr>2010-07-09 22:27:48 +0200
committerJunio C Hamano <gitster@pobox.com>2010-07-09 16:28:21 -0700
commit142183d09634aa00a47107c7ffc5e39fa6cbf1b0 (patch)
tree1c5ac235c183093419cd45d108eea26b8c2c5b54
parent0e418e568f4104ce1915263ae3ad66e290eebed8 (diff)
downloadgit-142183d09634aa00a47107c7ffc5e39fa6cbf1b0.tar.gz
git-142183d09634aa00a47107c7ffc5e39fa6cbf1b0.tar.xz
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>
-rw-r--r--Documentation/git-checkout.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index 7146288ad..7b8316222 100644
--- 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