public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: Jonathan Nieder <jrnieder@gmail•com>
To: "Julián Landerreche" <maniqui@gmail•com>
Cc: Junio C Hamano <gitster@pobox•com>, git@vger•kernel.org
Subject: Re: a more helpful message on "git status" output
Date: Fri, 18 Jul 2014 14:05:00 -0700	[thread overview]
Message-ID: <20140718210500.GU12427@google.com> (raw)
In-Reply-To: <CAKQhN+p5FpX-GEZeX0t-Y1Sq6+fdfRpE+ACqhKgdLWGFRj0ToA@mail.gmail.com>

Julián Landerreche wrote:

> 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)

Yes, I like this idea, with a few qualifications:

 1. The first line is long.  Is there a shorter way to say the same
    thing?  Maybe

    (use "git pull" to fetch newer commits and update your local branch)

 2. s/from upstream/from $remote/ (e.g., "from origin") in the first
    line?  Though that would make problem (1) worse.

 3. Is there some way to make it more obvious these two hints are
    independent suggestions and that the user doesn't need to do both?
    Maybe something as simple as

    (or use "git merge" to update your local branch)

 4. Should the advice differ based on whether the current branch is set
    up for merging or rebasing?

Thanks,
Jonathan

next prev parent reply	other threads:[~2014-07-18 21:05 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 [this message]
2014-07-18 21:12     ` Junio C Hamano
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=20140718210500.GU12427@google.com \
    --to=jrnieder@gmail$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    --cc=gitster@pobox$(echo .)com \
    --cc=maniqui@gmail$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox