From: "Célestin Matte" <celestin.matte@ensimag.fr>
To: "Mathieu Liénard--Mayor" <mathieu.lienard--mayor@ensimag.fr>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Git Users <git@vger.kernel.org>,
Jorge-Juan.Garcia-Garcia@ensimag.imag.fr,
Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Subject: Re: New feature discussion: git rebase --status
Date: Wed, 12 Jun 2013 13:12:48 +0200 [thread overview]
Message-ID: <51B857B0.5030603@ensimag.fr> (raw)
In-Reply-To: <fa9c12a81ef2e92ba75dd1271d9e0b2d@ensibm.imag.fr>
Le 12/06/2013 12:17, Mathieu Liénard--Mayor a écrit :
> Now, I'm not sure if we should always display the list of commits
> already applied and those left to apply. What I mean is that maybe it
> would be better to make status require a flag to display the two lists.
> Something like (not sure about the flag's name):
>
> $ git status --rebase-state
> # HEAD detached from ecb9f3e
> # Already applied 2 patches:
> # b170635... my_commit_message
> # b170635... my_commit_message
> # You are currently editing a832578... my_commit_message [3/5] while
> rebasing.
> # 2 patches left to apply:
> # b170635... my_commit_message
> # b170635... my_commit_message
> # (use "git commit --amend" to amend the current commit)
> # (use "git rebase --continue" once you are satisfied with your changes)
> # ......
> # ......
>
> What do you guys think ?
I agree. When you're in the process of rebasing a big list of commits,
it would produce a lot of not-so-useful output, when what you want to
see is, most of the time, which commit you are currently editing.
So, in my opinion, whole lists should not be displayed by default.
Now, if I could suggest an improvement over that list: when you rebase
some commits, I'm quite sure the history of what you already did is
stored somewhere since you can revert it which git rebase --abort. It
would be nice to improve that list by displaying these informations, like:
$ git status --rebase-state
# HEAD detached from ecb9f3e
# Already applied 4 patches:
# b170635... my_commit_message
# b170635... my_commit_message
# new: b170635... my_commit_message
# modified: b170635... my_commit_message
# reworded: b170635... my_commit_message
# You are currently editing a832578... my_commit_message [5/8] while
rebasing.
# 2 patches left to apply:
# b170635... my_commit_message
# b170635... my_commit_message
# (use "git commit --amend" to amend the current commit)
# (use "git rebase --continue" once you are satisfied with your changes)
# ......
# ......
I have no idea how complicated it would be to do that, though.
What do you think?
--
Célestin Matte
next prev parent reply other threads:[~2013-06-12 11:13 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-11 12:35 New feature discussion: git rebase --status Mathieu Liénard--Mayor
2013-06-11 12:40 ` Thomas Rast
2013-06-11 12:55 ` John Keeping
2013-06-11 13:19 ` Matthieu Moy
2013-06-11 17:18 ` Hilco Wijbenga
2013-06-11 17:23 ` Linus Torvalds
2013-06-12 10:17 ` Mathieu Liénard--Mayor
2013-06-12 11:12 ` Célestin Matte [this message]
2013-06-12 11:23 ` Mathieu Liénard--Mayor
2013-06-12 12:28 ` Antoine Pelisse
[not found] ` <CAH_OBifOeSSWB-LPT=Zv2AGEf5+nTh7yxE-1ijD0snFp3RS8Dw@mail.gmail.com>
2013-06-12 12:50 ` Mathieu Liénard--Mayor
2013-06-12 22:19 ` Junio C Hamano
2013-06-13 5:52 ` Antoine Pelisse
2013-06-13 12:19 ` Mathieu Liénard--Mayor
2013-06-12 12:41 ` Matthieu Moy
2013-06-12 12:52 ` John Keeping
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=51B857B0.5030603@ensimag.fr \
--to=celestin.matte@ensimag.fr \
--cc=Jorge-Juan.Garcia-Garcia@ensimag.imag.fr \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=mathieu.lienard--mayor@ensimag.fr \
--cc=torvalds@linux-foundation.org \
/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.
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 NNTP newsgroup(s).