From 142183d09634aa00a47107c7ffc5e39fa6cbf1b0 Mon Sep 17 00:00:00 2001 From: Nicolas Sebrecht Date: Fri, 9 Jul 2010 22:27:48 +0200 Subject: [PATCH] checkout: accord documentation to what git does Signed-off-by: Nicolas Sebrecht Signed-off-by: Junio C Hamano --- Documentation/git-checkout.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- 2.45.2