git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: New feature discussion: git rebase --status

From
Antoine Pelisse <apelisse@gmail.com>
Date
Jun 12, 2013, 12:28 UTC
Message-ID
<CALWbr2xhhUNTo54u7K5iFr+wSMSiX6JrgTX=QJsDQ6E30uwDzQ@mail.gmail.com>
In-Reply-To
<3cafe99fe3b868e6fc025110d324b9c8@ensibm.imag.fr>

On Wed, Jun 12, 2013 at 1:23 PM, Mathieu Liénard--Mayor <mathieu.lienard--mayor@ensimag.fr> wrote:

Show 32 quoted lines
> Le 2013-06-12 13:12, Célestin Matte a écrit :
>
>> Le 12/06/2013 12:17, Mathieu Liénard--Mayor a écrit :
>>>
>>> Now, I'm not sure if we should always display the list of commits
>>> already applied and those left to apply. What I mean is that maybe it
>>> would be better to make status require a flag to display the two lists.
>>> Something like (not sure about the flag's name):
>>>
>>> $ git status --rebase-state
>>> # HEAD detached from ecb9f3e
>>> # Already applied 2 patches:
>>> #     b170635... my_commit_message
>>> #     b170635... my_commit_message
>>> # You are currently editing a832578... my_commit_message [3/5] while
>>> rebasing.
>>> # 2 patches left to apply:
>>> #    b170635... my_commit_message
>>> #    b170635... my_commit_message
>>> #   (use "git commit --amend" to amend the current commit)
>>> #   (use "git rebase --continue" once you are satisfied with your
>>> changes)
>>> # ......
>>> # ......
>>>
>>> What do you guys think ?
>>
>>
>> I agree. When you're in the process of rebasing a big list of commits,
>> it would produce a lot of not-so-useful output, when what you want to
>> see is, most of the time, which commit you are currently editing.
>> So, in my opinion, whole lists should not be displayed by default.

Maybe we can display previous and next commits to provide some context. Like we do for diff. For example:

$ git status # HEAD detached from ecb9f3e # Already applied 330 patches (displaying next 3): # b170635... my_commit_message # b170635... my_commit_message # b170635... my_commit_message # Already applied 119 (displaying last 3) # b170635... my_commit_message # b170635... my_commit_message # b170635... my_commit_message # You are currently editing a832578... my_commit_message [120/450] while rebasing.

Also, I'm not sure about the "--rebase-state" flag. We should probably have some option to disable it (and re-enable if the default is changed through a config variable), but my understanding from previous messages was that not having to learn a new option to use that was quite important. As a consequence, I removed it from my example.

Previous: Mathieu Liénard--MayorNext: Junio C Hamano
Message 10 of 16 in “New feature discussion: git rebase --status”
  1. Mathieu Liénard--MayorJun 11, 2013
  2. Thomas RastJun 11, 2013
  3. John KeepingJun 11, 2013
  4. Matthieu MoyJun 11, 2013
  5. Hilco WijbengaJun 11, 2013
  6. Linus TorvaldsJun 11, 2013
  7. Mathieu Liénard--MayorJun 12, 2013
  8. Célestin MatteJun 12, 2013
  9. Mathieu Liénard--MayorJun 12, 2013
  10. Antoine PelisseJun 12, 2013
  11. Junio C HamanoJun 12, 2013
  12. Antoine PelisseJun 13, 2013
  13. Mathieu Liénard--MayorJun 13, 2013
  14. Matthieu MoyJun 12, 2013
  15. John KeepingJun 12, 2013
  16. Mathieu Liénard--MayorJun 12, 2013

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.