From: "Mike Ralphson" <mike.ralphson@gmail.com>
To: "Tim Harper" <timcharper@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] "not uptodate" changed to "has local changes"
Date: Tue, 6 May 2008 14:31:59 +0100 [thread overview]
Message-ID: <e2b179460805060631l506e2a6leaafc9c0acf3b05b@mail.gmail.com> (raw)
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
next prev parent reply other threads:[~2008-05-06 13:32 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-03 16:59 [PATCH] "not uptodate" changed to "has local changes" Tim Harper
2008-05-06 13:31 ` Mike Ralphson [this message]
2008-05-16 2:14 ` André Goddard Rosa
2008-05-16 10:25 ` Johannes Schindelin
2008-05-16 11:02 ` Holger Schurig
2008-05-16 11:50 ` Francis Moreau
2008-05-16 12:22 ` Johannes Schindelin
2008-05-16 17:12 ` Kevin Ballard
2008-05-17 3:30 ` André Goddard Rosa
2008-05-17 10:04 ` Johannes Schindelin
2008-05-17 14:44 ` Steven Walter
2008-05-17 16:12 ` Sverre Rabbelier
2008-05-17 18:44 ` Johannes Schindelin
2008-05-17 20:14 ` Sverre Rabbelier
[not found] ` <200805181032.m4IAWjE0012832@mi0.bluebottle.com>
2008-05-18 11:11 ` Sverre Rabbelier
2008-05-17 19:03 ` Re* " Junio C Hamano
2008-05-17 20:29 ` Sverre Rabbelier
2008-05-19 6:55 ` Wincent Colaiuta
2008-05-19 17:47 ` Junio C Hamano
2008-05-19 18:28 ` Sverre Rabbelier
2008-05-19 19:32 ` Daniel Barkalow
2008-05-21 7:07 ` Junio C Hamano
2008-05-17 15:08 ` Wincent Colaiuta
2008-05-17 15:32 ` Matthieu Moy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e2b179460805060631l506e2a6leaafc9c0acf3b05b@mail.gmail.com \
--to=mike.ralphson@gmail.com \
--cc=git@vger.kernel.org \
--cc=timcharper@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).