From: Junio C Hamano <gitster@pobox.com>
To: Matthieu Moy <Matthieu.Moy@imag.fr>
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
Subject: Re: [PATCH v4 0/4] More helpful 'git status' during 'rebase -i'
Date: Tue, 30 Jun 2015 16:03:25 -0700 [thread overview]
Message-ID: <xmqqpp4cbxz6.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1435669275-32102-1-git-send-email-Matthieu.Moy@imag.fr> (Matthieu Moy's message of "Tue, 30 Jun 2015 15:01:11 +0200")
Matthieu Moy <Matthieu.Moy@imag.fr> writes:
> 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.
I'd prefer to see these $COMMITn abbreviated, just like $ONTO. Look
what I just got while squashing two adjacent patches ;-)
# interactive rebase in progress; onto a04bfc2
# Last commands done (2 commands done):
# pick c186b073f46a3298f2e6f63a8c1becb07bedc4f0 rerere: explain what 'want_sp' does to is_cmarker
# squash 17c5b40b46c0e171ed49907e6cb91c2a1d7f7113 rerere: drop want_sp parameter from is_cmarker()
# Next commands to do (3 remaining commands):
# pick 8fc64c4c1024006e71cf0b6c2e3d0ad403f263f8 t4200: rerere a merge with two identical conflicts
# pick 094950cdc51599f6fec1b1c0098816888a648bf8 rerere: document internal I/O abstraction
# You are currently editing a commit while rebasing branch 'jc/rerere' on 'a04bfc2'.
next prev parent reply other threads:[~2015-06-30 23:03 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-30 13:01 [PATCH v4 0/4] More helpful 'git status' during 'rebase -i' Matthieu Moy
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 ` Junio C Hamano [this message]
2015-07-01 8:12 ` [PATCH v4 0/4] More helpful 'git status' during 'rebase -i' 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=xmqqpp4cbxz6.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=Matthieu.Moy@imag.fr \
--cc=antoine.delaite@ensimag.grenoble-inp.fr \
--cc=git@vger.kernel.org \
--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).