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

Re: [RFC/PATCH v2] create a skeleton for the command git rebase --status

From
Junio C Hamano <gitster@pobox.com>
Date
May 29, 2015, 15:44 UTC
Message-ID
<xmqqoal3e6d3.fsf@gitster.dls.corp.google.com>
In-Reply-To
<vpq4mmvv37f.fsf@anie.imag.fr>
Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:
Show 12 quoted lines
> Guillaume Pages <guillaume.pages@ensimag.grenoble-inp.fr> writes:
> ...
>> And during an interactive rebase:
>>
>> rebase in progress;
>
> This could even become "interactive rebase in progress".
>
> Most of the time, you're supposed to remember whether you ran "git
> rebase" with -i, but a typical use-case is when a newbie requests help
> like "I don't know what I did, but can you fix it?", and then any
> information can be valuable.
Yeah, I like that.
Show 8 quoted lines
> Not sure the blank lines are meant to be there, but I wouldn't put them
> in the actual output. I'd format it as
>
> Last commands done (5 commands done) :
>   pick 62609785 commit message1
>   (see more at .git/rebase-merge/done)
>
> (lower-case "see" to be consistant with other hints)
Nice.
Show 6 quoted lines
>> Is it a good practice to send the user find information in the .git
>> directory?
>
> We usually avoid doing that and provide commands to do this (e.g. "git
> rebase --edit-todo" instead of asking the user to do $EDITOR
> .git/rebase-merge/git-rebase-todo), but the ones you show seem OK to me.

Yeah, I think it is OK to suggest peeking into (not writing) files like this. We may update the internal implementation but then the suggestion can and should be updated when that happens.

Previous: Matthieu Moy
Message 10 of 10 in “create a skeleton for the command git rebase --status”
  1. create a skeleton for the command git rebase --statusGuillaume Pagès, May 28, 2015
  2. Matthieu MoyMay 28, 2015
  3. Guillaume PagesMay 28, 2015
  4. Matthieu MoyMay 28, 2015
  5. Junio C HamanoMay 28, 2015
  6. Matthieu MoyMay 28, 2015
  7. Junio C HamanoMay 28, 2015
  8. Guillaume PagesMay 29, 2015
  9. Matthieu MoyMay 29, 2015
  10. Junio C HamanoMay 29, 2015

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.