From: Junio C Hamano <gitster@pobox.com>
To: Nicolas Sebrecht <nicolas.s.dev@gmx.fr>
Cc: git@vger.kernel.org
Subject: Re: messages confusing
Date: Mon, 05 Jul 2010 23:21:47 -0700 [thread overview]
Message-ID: <7v630t5dvo.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <20100706053543.GA13054@vidovic> (Nicolas Sebrecht's message of "Tue\, 6 Jul 2010 07\:35\:43 +0200")
Nicolas Sebrecht <nicolas.s.dev@gmx.fr> writes:
> I had those messages today
>
> % git merge origin/master
> Already uptodate!
> Merge made by recursive.
> %
This is quite an old message; I don't think it has much to do with 1.7-ness
of your version.
The first "uptodate" refers to your tree state being up-to-date. You
already had the necessary changes the other history wanted you to
have---they were acquired in your history before you started this merge by
some other means. Perhaps merging from other trees, or picking up
equivalent patches from mailing list, etc.
A merge commit is still created in this case, in order to record the fact
that everything origin/master wanted to do to your history has already
been reconciled to your history. Otherwise "git log ..origin/master" will
still show commits your history does not have.
next prev parent reply other threads:[~2010-07-06 6:22 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 ` [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 ` Junio C Hamano [this message]
2010-07-06 8:58 ` messages confusing 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=7v630t5dvo.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.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).