From: Junio C Hamano <gitster@pobox•com>
To: "Julián Landerreche" <maniqui@gmail•com>
Cc: git@vger•kernel.org
Subject: Re: a more helpful message on "git status" output
Date: Fri, 18 Jul 2014 14:12:13 -0700 [thread overview]
Message-ID: <xmqqy4vql6c2.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <CAKQhN+p5FpX-GEZeX0t-Y1Sq6+fdfRpE+ACqhKgdLWGFRj0ToA@mail.gmail.com> ("Julián Landerreche"'s message of "Fri, 18 Jul 2014 16:47:15 -0300")
Julián Landerreche <maniqui@gmail•com> writes:
>> By running "git pull", the user may obtain yet newer commits from
>> the upstream, which very likely will happen in an active project, or
>> "git fetch" launched by "git pull" will return without doing
>> anything after noticing there is nothing new.
>>
>> As long as the updates to the upstream is also a fast-forward, it
>> will still fast-forward you, but to an even newer state of the
>> upstream.
>>
>> There is no harm done[*1*] by suggesting "git pull" over "git
>> merge", no?
>
> OK, I'm mostly convinced.
> A more verbose, educational output could read:
>
> (use "git pull" to fetch newer commits from upstream and update your
> local branch)
> (use "git merge" to update your local branch)
I actually do not like that, to be honest.
These brief reminders should be just that, and if anything, we
should aim to make them shorter and more concise, not longer and
more verbose. They will never be sufficient to replace "education"
(otherwise why would we even have complete manual?)---they should
just point the users clearly in the right direction.
next prev parent reply other threads:[~2014-07-18 21:12 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-18 19:03 a more helpful message on "git status" output Julián Landerreche
2014-07-18 19:29 ` Junio C Hamano
2014-07-18 19:47 ` Julián Landerreche
2014-07-18 21:05 ` Jonathan Nieder
2014-07-18 21:12 ` Junio C Hamano [this message]
2014-07-21 10:20 ` 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=xmqqy4vql6c2.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=maniqui@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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