Re: [PATCH] "not uptodate" changed to "has local changes"

From: André Goddard Rosa <andre.goddard@gmail.com>
Date: May 16, 2008, 02:14 UTC
Message-ID: <b8bf37780805151914j65ce5406xc5e6b3d29e3bfb9b@mail.gmail.com>
In-Reply-To: <e2b179460805060631l506e2a6leaafc9c0acf3b05b@mail.gmail.com>

Show 6 quoted lines

>>  This patch will make git a little more human friendly, reporting "file.txt: has local changes".
>
> Documentation/git-checkout.txt should also change in this case,
> otherwise users will see different output to that described and
> possibly get confused if following along with the examples.
>

I like the idea too.

--- [PATCH] "not uptodate" changed to "has local changes"

Use more straightforward message for regular user.

Signed-off-by: Andre Goddard Rosa <andre.goddard@gmail.com>

diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index a644173..624dea6 100644
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -168,7 +168,7 @@ the above checkout would fail like this:
 +
 ------------
 $ git checkout mytopic
-fatal: Entry 'frotz' not uptodate. Cannot merge.
+fatal: Entry 'frotz' has local changes. Cannot merge.
 ------------
 +
 You can give the `-m` flag to the command, which would try a