From: John Keeping Date: Wed, 12 Jun 2013 12:52:26 GMT Subject: Re: New feature discussion: git rebase --status Message-ID: <20130612125226.GP22905@serenity.lan> In-Reply-To: On Wed, Jun 12, 2013 at 02:41:25PM +0200, Matthieu Moy wrote: > Mathieu Liénard--Mayor 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.