From: Wincent Colaiuta <win@wincent.com>
To: Nicolas Sebrecht <nicolas.s.dev@gmx.fr>
Cc: git@vger.kernel.org
Subject: Re: messages confusing
Date: Tue, 6 Jul 2010 07:53:06 +0200 [thread overview]
Message-ID: <ACE6C748-1F26-473B-BC69-33C59A3969BD@wincent.com> (raw)
In-Reply-To: <20100706053543.GA13054@vidovic>
El 06/07/2010, a las 07:35, Nicolas Sebrecht escribió:
> Hi all,
>
> I had those messages today
>
> % git merge origin/master
> Already uptodate!
> Merge made by recursive.
> %
>
> with git version 1.7.2.rc1.210.g7b476 and I wonder if it is really
> intended. It did create an empty merge commit but I find both messages
> together a bit confusing here. Why would Git merge if uptodate?
In any case, "uptodate" should be written as "up-to-date" for consistency with other user-visible messages in Git and in the docs.
Wincent
next prev parent reply other threads:[~2010-07-06 6:54 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-06 5:35 messages confusing Nicolas Sebrecht
2010-07-06 5:53 ` Wincent Colaiuta [this message]
2010-07-06 9:13 ` [PATCH] use "up-to-date" in messages instead of "uptodate" for consistency Nicolas Sebrecht
2010-07-06 12:47 ` Ævar Arnfjörð Bjarmason
2010-07-06 15:55 ` [PATCH v2] use "up-to-date" " Nicolas Sebrecht
2010-07-07 5:28 ` Junio C Hamano
2010-07-07 5:46 ` [PATCH v2] " Nicolas Sebrecht
2010-07-07 7:18 ` Junio C Hamano
2010-07-07 7:54 ` [PATCH v3] merge-recursive: use "up-to-date" instead of "uptodate" in error message " Nicolas Sebrecht
2010-07-08 0:26 ` Junio C Hamano
2010-07-09 20:27 ` [PATCH 1/2] checkout: accord documentation to what git does Nicolas Sebrecht
2010-07-09 20:27 ` [PATCH v4 2/2] merge-recursive: use "up-to-date" instead of "uptodate" in error message for consistency Nicolas Sebrecht
2010-07-10 0:39 ` Junio C Hamano
2010-07-10 0:36 ` [PATCH 1/2] checkout: accord documentation to what git does Junio C Hamano
2010-07-06 6:21 ` messages confusing Junio C Hamano
2010-07-06 8:58 ` Nicolas Sebrecht
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ACE6C748-1F26-473B-BC69-33C59A3969BD@wincent.com \
--to=win@wincent.com \
--cc=git@vger.kernel.org \
--cc=nicolas.s.dev@gmx.fr \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).