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

Re: [PATCH 0/3] rebase -i: drop, missing commits and static checks

From
Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date
Jun 30, 2015, 17:03 UTC
Message-ID
<vpqy4j12knh.fsf@anie.imag.fr>
In-Reply-To
<70428267.93232.1435683724659.JavaMail.zimbra@ensimag.grenoble-inp.fr>
Remi Galan Alfonso <remi.galan-alfonso@ensimag.grenoble-inp.fr> writes:
Show 12 quoted lines
> Junio C Hamano <gitster@pobox.com> writes:
>> The place where an error can be introduced is (assuming that what
>> "rebase -i" writes out itself is perfect ;-) where we allow the user
>> to edit, so instead of checking before "--continue", I would expect
>> a sane design would check immediately after the editor we spawned
>> returns.
>
> Makes sense but we would have the problem mentioned by Matthieu:
>> Warning: the command isn't recognized ...
>>   
>> # Hmm, let's ignore that warning
>> $ git rebase --continue
There's an alternative:
$ git rebase --edit-todo
# Make mistakes, save and quit
Your todo-list has the following issues:
- ...
Do you want to edit again (no aborts the rebase) [Y/n]?

There's a precedent with the 'e' command of "git add -p". I have a slight preference for non-interactive commands so I prefer not going this way though.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/
Previous: Remi Galan AlfonsoNext: Junio C Hamano
Message 13 of 14 in “rebase -i: drop, missing commits and static checks”
  1. Galan RémiJun 29, 2015
  2. 1/3 git-rebase -i: add command "drop" to remove a commitGalan Rémi, Jun 29, 2015
  3. 2/3 git rebase -i: warn about removed commitsGalan Rémi, Jun 29, 2015
  4. 3/3 git rebase -i: add static check for commands and SHA-1Galan Rémi, Jun 29, 2015
  5. 0/3 rebase -i: drop, missing commits and static checksMatthieu Moy, Jun 30, 2015
  6. 1/3 fixup! git rebase -i: add static check for commands and SHA-1Matthieu Moy, Jun 30, 2015
  7. 2/3 fixup! git rebase -i: warn about removed commitsMatthieu Moy, Jun 30, 2015
  8. 3/3 fixup! git rebase -i: warn about removed commitsMatthieu Moy, Jun 30, 2015
  9. Remi Galan AlfonsoJun 30, 2015
  10. Matthieu MoyJun 30, 2015
  11. Junio C HamanoJun 30, 2015
  12. Remi Galan AlfonsoJun 30, 2015
  13. Matthieu MoyJun 30, 2015
  14. Junio C HamanoJun 30, 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.