>> 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@xxxxxxxxx> 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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
