All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Thomas Ackermann <th.acker@arcor.de>
Cc: jrnieder@gmail.com, bturner@atlassian.com,
	worldhello.net@gmail.com, git@vger.kernel.org
Subject: Re: Aw: Re: Re: Re: [Bug report] 'git status' always says "Your branch is up-to-date with 'origin/master'"
Date: Mon, 06 Jan 2014 09:12:48 -0800	[thread overview]
Message-ID: <xmqqlhytjapb.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1067660482.1596252.1389024023072.JavaMail.ngmail@webmail11.arcor-online.net> (Thomas Ackermann's message of "Mon, 6 Jan 2014 17:00:23 +0100 (CET)")

Thomas Ackermann <th.acker@arcor.de> writes:

>  
>> > But for the simple use case where you only have a master
>> > branch I consider it not really helpful and - at least for me -
>> > misleading.
>> 
>> I see what you mean, and you're not the only one.
>> 
>> Git follows a rule of "never contact another machine unless explicitly
>> asked to using a command such as 'git pull' or 'git fetch'".  To
>> support this, it makes a distinction between (1) the remote-tracking
>> ref origin/master and (2) the actual branch "master" in the remote
>> repository.  The former is what is updated by 'git fetch', and the
>> latter is something git does not know about without talking to the
>> remote server.
>> 
>> What documentation did you use when first starting to learn git?
>> Perhaps it can be fixed to emphasize the distinction between (1) and
>> (2) earlier.
>
> I think it's not the problem of the documentation but of myself
> not having it read thorough enough ;-)
>
> (This new feature in V1.8.5 of course is not documented in any of the books
> up to now but in the future could be used to explain the above mentioned
> rule.)

By the way, this is nothing new in 1.8.5; we didn't bother saying
up-to-date before, so you may not have noticed, but its silence was
already telling you that your branch was up-to-date with respect to
what you are building on top of.

>
> Thanks to you, Bryan and Jiang for your help!
>
> ---
> Thomas

  reply	other threads:[~2014-01-06 17:12 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-06  8:24 Aw: Re: [Bug report] 'git status' always says "Your branch is up-to-date with 'origin/master'" Thomas Ackermann
2014-01-06  8:48 ` Bryan Turner
2014-01-06  9:08   ` Aw: " Thomas Ackermann
2014-01-06 15:45     ` Jonathan Nieder
2014-01-06 16:00       ` Aw: " Thomas Ackermann
2014-01-06 17:12         ` Junio C Hamano [this message]
2014-01-14 23:34           ` Keshav Kini
2014-01-06  9:04 ` Jiang Xin

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=xmqqlhytjapb.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox.com \
    --cc=bturner@atlassian.com \
    --cc=git@vger.kernel.org \
    --cc=jrnieder@gmail.com \
    --cc=th.acker@arcor.de \
    --cc=worldhello.net@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.