Re: New feature discussion: git rebase --status

2013-06-13 Thread Mathieu Liénard--Mayor
Le 2013-06-13 07:52, Antoine Pelisse a écrit : On Thu, Jun 13, 2013 at 12:19 AM, Junio C Hamano gits...@pobox.com wrote: Antoine Pelisse apeli...@gmail.com writes: Maybe we can display previous and next commits to provide some context. Like we do for diff. For example: $ git status # HEAD

Re: New feature discussion: git rebase --status

2013-06-12 Thread Mathieu Liénard--Mayor
After a few hours, here's a quick summary of your opinions: -'git status' should be the command to display the information instead of a --status flag -the SHA1 of the patch being applied currently is a very important information -displaying how we got to this state would be nice I had in

Re: New feature discussion: git rebase --status

2013-06-12 Thread Célestin Matte
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

Re: New feature discussion: git rebase --status

2013-06-12 Thread Mathieu Liénard--Mayor
Le 2013-06-12 13:12, Célestin Matte a écrit : 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

Re: New feature discussion: git rebase --status

2013-06-12 Thread Antoine Pelisse
On Wed, Jun 12, 2013 at 1:23 PM, Mathieu Liénard--Mayor mathieu.lienard--ma...@ensimag.fr wrote: Le 2013-06-12 13:12, Célestin Matte a écrit : 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

Re: New feature discussion: git rebase --status

2013-06-12 Thread Matthieu Moy
Mathieu Liénard--Mayor mathieu.lienard--ma...@ensimag.fr writes: $ git status # HEAD detached from ecb9f3e # You are currently editing a832578... my_commit_message [3/5] while rebasing. Showing the commit message here is too much IMHO. With a typical 50-characters message, it already gives

Re: New feature discussion: git rebase --status

2013-06-12 Thread Mathieu Liénard--Mayor
Le 2013-06-12 14:44, shawn wilson a écrit : Either leave it or just show the next, last, and current commit. Not a whole --continue, --amend, etc stuff. The first time I had to rebase (about a month ago) it took me a minute to Google and figure the rest out. Well, the current output looks

Re: New feature discussion: git rebase --status

2013-06-12 Thread Junio C Hamano
Antoine Pelisse apeli...@gmail.com writes: Maybe we can display previous and next commits to provide some context. Like we do for diff. For example: $ git status # HEAD detached from ecb9f3e # Already applied 330 patches (displaying next 3): # b170635... my_commit_message #

Re: New feature discussion: git rebase --status

2013-06-12 Thread Antoine Pelisse
On Thu, Jun 13, 2013 at 12:19 AM, Junio C Hamano gits...@pobox.com wrote: Antoine Pelisse apeli...@gmail.com writes: Maybe we can display previous and next commits to provide some context. Like we do for diff. For example: $ git status # HEAD detached from ecb9f3e # Already applied 330

New feature discussion: git rebase --status

2013-06-11 Thread Mathieu Liénard--Mayor
(Got the idea from: https://git.wiki.kernel.org/index.php/SmallProjectsIdeas#git_rebase_--status) When in the middle of a rebase, users can be easily confused about what to do, or where they are in the rebase process. All the information is available in .git/rebase-merge/, but I believe it

Re: New feature discussion: git rebase --status

2013-06-11 Thread Thomas Rast
Mathieu Liénard--Mayor mathieu.lienard--ma...@ensimag.fr writes: (Got the idea from: https://git.wiki.kernel.org/index.php/SmallProjectsIdeas#git_rebase_--status) When in the middle of a rebase, users can be easily confused about what to do, or where they are in the rebase process. All the

Re: New feature discussion: git rebase --status

2013-06-11 Thread Matthieu Moy
John Keeping j...@keeping.me.uk writes: The one piece of information that I often want is the SHA1 of the commit that is currently being applied. Currently I have to look through my scrollback for the stopping message or poke around in .git/. Having that in the output of git status would be

Re: New feature discussion: git rebase --status

2013-06-11 Thread Hilco Wijbenga
On 11 June 2013 06:19, Matthieu Moy matthieu@grenoble-inp.fr wrote: John Keeping j...@keeping.me.uk writes: The one piece of information that I often want is the SHA1 of the commit that is currently being applied. Currently I have to look through my scrollback for the stopping message or

Re: New feature discussion: git rebase --status

2013-06-11 Thread Linus Torvalds
On Tue, Jun 11, 2013 at 10:18 AM, Hilco Wijbenga hilco.wijbe...@gmail.com wrote: Having git status display (even more) context sensitive information during git rebase or git merge would be very welcome. Please, if at all possible, don't make that a separate command. I agree. The rebase state