From: Mike Ralphson <mike.ralphson@gmail.com>
Date: Tue, 06 May 2008 13:31:59 GMT
Subject: Re: [PATCH] "not uptodate" changed to "has local changes"
Message-ID: <e2b179460805060631l506e2a6leaafc9c0acf3b05b@mail.gmail.com>
In-Reply-To: <1209833972-12256-1-git-send-email-timcharper@gmail.com>

2008/5/3 Tim Harper <timcharper@gmail.com>:
> When doing a merge, the message says "file.txt: needs update", or "file.txt: not uptodate, cannot merge".   While internally 'uptodate' makes sense, from the outside it's a mystery.
>
>  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.

Mike