From: Nicolas Sebrecht <nicolas.s.dev@gmx.fr>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, "Wincent Colaiuta" <win@wincent.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Nicolas Sebrecht" <nicolas.s.dev@gmx.fr>
Subject: [PATCH v4 2/2] merge-recursive: use "up-to-date" instead of "uptodate" in error message for consistency
Date: Fri, 9 Jul 2010 22:27:49 +0200 [thread overview]
Message-ID: <f5c54a4e27321b4ffb0f1f8542530281ef7841eb.1278707023.git.nicolas.s.dev@gmx.fr> (raw)
In-Reply-To: <7vd3uystsh.fsf@alter.siamese.dyndns.org>
In-Reply-To: <33e9dcc468b1e1ed18a180046f5d4c135921c7ab.1278707023.git.nicolas.s.dev@gmx.fr>
Signed-off-by: Nicolas Sebrecht <nicolas.s.dev@gmx.fr>
---
merge-recursive.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/merge-recursive.c b/merge-recursive.c
index 856e98c..fb6aa4a 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1214,7 +1214,7 @@ int merge_trees(struct merge_options *o,
}
if (sha_eq(common->object.sha1, merge->object.sha1)) {
- output(o, 0, "Already uptodate!");
+ output(o, 0, "Already up-to-date!");
*result = head;
return 1;
}
--
1.7.2.rc2.194.g494e9.dirty
next prev parent reply other threads:[~2010-07-09 20:28 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
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 ` Nicolas Sebrecht [this message]
2010-07-10 0:39 ` [PATCH v4 2/2] merge-recursive: use "up-to-date" instead of "uptodate" in error message for consistency 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=f5c54a4e27321b4ffb0f1f8542530281ef7841eb.1278707023.git.nicolas.s.dev@gmx.fr \
--to=nicolas.s.dev@gmx.fr \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=win@wincent.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.
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).