git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: John Keeping <john@keeping.me.uk>
To: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Cc: "Mathieu Liénard--Mayor" <mathieu.lienard--mayor@ensimag.fr>,
	"Linus Torvalds" <torvalds@linux-foundation.org>,
	"Git Users" <git@vger.kernel.org>,
	Jorge-Juan.Garcia-Garcia@ensimag.imag.fr
Subject: Re: New feature discussion: git rebase --status
Date: Wed, 12 Jun 2013 13:52:26 +0100	[thread overview]
Message-ID: <20130612125226.GP22905@serenity.lan> (raw)
In-Reply-To: <vpqehc7y00a.fsf@anie.imag.fr>

On Wed, Jun 12, 2013 at 02:41:25PM +0200, Matthieu Moy wrote:
> Mathieu Liénard--Mayor <mathieu.lienard--mayor@ensimag.fr> writes:
> 
> > $ git status
> > # HEAD detached from ecb9f3e
> > # You are currently editing a832578... my_commit_message [3/5] while
> > rebasing.
> 
> Showing the commit message here is too much IMHO. With a typical
> 50-characters message, it already gives
> 
> # You are currently editing a832578 __________________________________________________ [3/5] while rebasing
> 
> and we usually try to fit everything on a 80-columns terminal.
> 
> My vote would go for just showing the short sha1. The user can run "git
> show $sha1" to get more information if needed, it's just a copy-paste
> away. If we want to show the commit message, it should be on its own
> line.

I agree.  I liked your earlier suggestion of adding something like
"(applying 1d3fb08, 2/5)".  Where "applying" should be "cherry picking"
or "reverting" when appropriate.

I actually think this should be the only change to the default status
output, additional information on the full list of commits being applied
should either come from "git rebase --status" or some new flag to "git
status" which is off by default.

      reply	other threads:[~2013-06-12 12:52 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-11 12:35 New feature discussion: git rebase --status Mathieu Liénard--Mayor
2013-06-11 12:40 ` Thomas Rast
2013-06-11 12:55 ` John Keeping
2013-06-11 13:19   ` Matthieu Moy
2013-06-11 17:18     ` Hilco Wijbenga
2013-06-11 17:23       ` Linus Torvalds
2013-06-12 10:17         ` Mathieu Liénard--Mayor
2013-06-12 11:12           ` Célestin Matte
2013-06-12 11:23             ` Mathieu Liénard--Mayor
2013-06-12 12:28               ` Antoine Pelisse
     [not found]                 ` <CAH_OBifOeSSWB-LPT=Zv2AGEf5+nTh7yxE-1ijD0snFp3RS8Dw@mail.gmail.com>
2013-06-12 12:50                   ` Mathieu Liénard--Mayor
2013-06-12 22:19                 ` Junio C Hamano
2013-06-13  5:52                   ` Antoine Pelisse
2013-06-13 12:19                     ` Mathieu Liénard--Mayor
2013-06-12 12:41           ` Matthieu Moy
2013-06-12 12:52             ` John Keeping [this message]

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=20130612125226.GP22905@serenity.lan \
    --to=john@keeping.me.uk \
    --cc=Jorge-Juan.Garcia-Garcia@ensimag.imag.fr \
    --cc=Matthieu.Moy@grenoble-inp.fr \
    --cc=git@vger.kernel.org \
    --cc=mathieu.lienard--mayor@ensimag.fr \
    --cc=torvalds@linux-foundation.org \
    /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 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 NNTP newsgroup(s).