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

[PATCH v4 0/4] More helpful 'git status' during 'rebase -i'

From
Matthieu Moy <matthieu.moy@imag.fr>
Date
Jun 30, 2015, 13:01 UTC
Message-ID
<1435669275-32102-1-git-send-email-Matthieu.Moy@imag.fr>
This series makes "git status" provide an output like
  interactive rebase in progress; onto $ONTO
  Last commands done (2 commands done):
     pick $COMMIT2 two_commit
     exec exit 15
  Next commands to do (2 remaining commands):
     pick $COMMIT3 three_commit
     pick $COMMIT4 four_commit
    (use "git rebase --edit-todo" to view and edit)

in addition to the existing output, when ran during an interactive rebase.

Previous version here:
  http://thread.gmane.org/gmane.comp.version-control.git/271184

I just fixed the missing newline I noticed, and squashed Junio's indentation fix. These were the only two remarks on the last iteration.

Guillaume Pagès (4):
  status: factor two rebase-related messages together
  status: differentiate interactive from non-interactive rebases
  status: give more information during rebase -i
  status: add new tests for status during rebase -i
 t/t7512-status-help.sh | 226 ++++++++++++++++++++++++++++++++++++++++++++++---
 wt-status.c            | 100 ++++++++++++++++++----
 2 files changed, 295 insertions(+), 31 deletions(-)
-- 
2.5.0.rc0.10.g7792c2a
Next: Matthieu Moy
Message 1 of 26 in “More helpful 'git status' during 'rebase -i'”
  1. 0/4 More helpful 'git status' during 'rebase -i'Matthieu Moy, Jun 30, 2015
  2. 1/4 status: factor two rebase-related messages togetherMatthieu Moy, Jun 30, 2015
  3. 2/4 status: differentiate interactive from non-interactive rebasesMatthieu Moy, Jun 30, 2015
  4. 3/4 status: give more information during rebase -iMatthieu Moy, Jun 30, 2015
  5. 4/4 status: add new tests for status during rebase -iMatthieu Moy, Jun 30, 2015
  6. Junio C HamanoJun 30, 2015
  7. Matthieu MoyJul 1, 2015
  8. 1/4 status: factor two rebase-related messages togetherMatthieu Moy, Jul 1, 2015
  9. 2/4 status: differentiate interactive from non-interactive rebasesMatthieu Moy, Jul 1, 2015
  10. 3/4 status: give more information during rebase -iMatthieu Moy, Jul 1, 2015
  11. Junio C HamanoJul 1, 2015
  12. Eric SunshineJul 1, 2015
  13. Junio C HamanoJul 1, 2015
  14. Eric SunshineJul 1, 2015
  15. Matthieu MoyJul 1, 2015
  16. 1/4 status: factor two rebase-related messages togetherMatthieu Moy, Jul 1, 2015
  17. 2/4 status: differentiate interactive from non-interactive rebasesMatthieu Moy, Jul 1, 2015
  18. 3/4 status: give more information during rebase -iMatthieu Moy, Jul 1, 2015
  19. Junio C HamanoJul 7, 2015
  20. Matthieu MoyJul 8, 2015
  21. 4/4 status: add new tests for status during rebase -iMatthieu Moy, Jul 1, 2015
  22. Junio C HamanoJul 1, 2015
  23. Matthieu MoyJul 2, 2015
  24. Junio C HamanoJul 3, 2015
  25. Matthieu MoyJul 2, 2015
  26. 4/4 status: add new tests for status during rebase -iMatthieu Moy, Jul 1, 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.