From: Matthieu Moy <Matthieu.Moy@imag.fr>
To: gitster@pobox.com
Cc: git@vger.kernel.org, remi.lespinet@ensimag.grenoble-inp.fr,
guillaume.pages@ensimag.grenoble-inp.fr,
louis--alexandre.stuber@ensimag.grenoble-inp.fr,
antoine.delaite@ensimag.grenoble-inp.fr,
Matthieu Moy <Matthieu.Moy@imag.fr>
Subject: [PATCH v4 0/4] More helpful 'git status' during 'rebase -i'
Date: Tue, 30 Jun 2015 15:01:11 +0200 [thread overview]
Message-ID: <1435669275-32102-1-git-send-email-Matthieu.Moy@imag.fr> (raw)
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 reply other threads:[~2015-06-30 13:01 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-30 13:01 Matthieu Moy [this message]
2015-06-30 13:01 ` [PATCH v4 1/4] status: factor two rebase-related messages together Matthieu Moy
2015-06-30 13:01 ` [PATCH v4 2/4] status: differentiate interactive from non-interactive rebases Matthieu Moy
2015-06-30 13:01 ` [PATCH v4 3/4] status: give more information during rebase -i Matthieu Moy
2015-06-30 13:01 ` [PATCH v4 4/4] status: add new tests for status " Matthieu Moy
2015-06-30 23:03 ` [PATCH v4 0/4] More helpful 'git status' during 'rebase -i' Junio C Hamano
2015-07-01 8:12 ` Matthieu Moy
2015-07-01 8:30 ` [PATCH v5 1/4] status: factor two rebase-related messages together Matthieu Moy
2015-07-01 8:30 ` [PATCH v5 2/4] status: differentiate interactive from non-interactive rebases Matthieu Moy
2015-07-01 8:30 ` [PATCH v5 3/4] status: give more information during rebase -i Matthieu Moy
2015-07-01 16:18 ` Junio C Hamano
2015-07-01 16:33 ` Eric Sunshine
2015-07-01 16:36 ` Junio C Hamano
2015-07-01 16:37 ` Eric Sunshine
2015-07-01 21:06 ` Matthieu Moy
2015-07-01 21:08 ` [PATCH v6 1/4] status: factor two rebase-related messages together Matthieu Moy
2015-07-01 21:08 ` [PATCH v6 2/4] status: differentiate interactive from non-interactive rebases Matthieu Moy
2015-07-01 21:08 ` [PATCH v6 3/4] status: give more information during rebase -i Matthieu Moy
2015-07-07 22:14 ` Junio C Hamano
2015-07-08 7:10 ` Matthieu Moy
2015-07-01 21:08 ` [PATCH v6 4/4] status: add new tests for status " Matthieu Moy
2015-07-01 21:23 ` [PATCH v5 3/4] status: give more information " Junio C Hamano
2015-07-02 8:01 ` Matthieu Moy
2015-07-03 17:40 ` Junio C Hamano
2015-07-02 8:10 ` Matthieu Moy
2015-07-01 8:30 ` [PATCH v5 4/4] status: add new tests for status " Matthieu Moy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1435669275-32102-1-git-send-email-Matthieu.Moy@imag.fr \
--to=matthieu.moy@imag.fr \
--cc=antoine.delaite@ensimag.grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=guillaume.pages@ensimag.grenoble-inp.fr \
--cc=louis--alexandre.stuber@ensimag.grenoble-inp.fr \
--cc=remi.lespinet@ensimag.grenoble-inp.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).