From: Guillaume Pages <guillaume.pages@ensimag.grenoble-inp.fr>
Date: Tue, 26 May 2015 14:38:01 GMT
Subject: Implementation of git rebase --status
Message-ID: <2024498388.1201300.1432651081110.JavaMail.zimbra@ensimag.grenoble-inp.fr>
In-Reply-To: <1086316854.1201217.1432650834727.JavaMail.zimbra@ensimag.grenoble-inp.fr>

Hi, 

I would like to implement a new command git rebase --status to inform the user 
about the current rebase session. Here is a sample of what I think it could 
look like in case of merge conflict: 

git rebase --status 
You are in the middle of a rebase session. 
The line that paused this session is: 
pick 848a16f commit with conflicts 
CONFLICT (content): Merge conflict in file1 
Consult and edit remaining actions with git rebase --edit-todo 

In case of syntax error: 

git rebase --status 
You are in the middle of a rebase session. 
The line that paused this session is: 
tick 848a16f syntax error 
SYNTAX ERROR 
Consult and edit remaining actions with git rebase --edit-todo 

In case of error during the execution of a script: 

git rebase --status 
You are in the middle of a rebase session. 
The line that paused this session is: 
exec exit 3 
ERROR IN SCRIPT EXECUTION 
Consult and edit remaining actions with git rebase --edit-todo 

Do you think it could be usefull or do you have any suggestion? 

Thanks, 

Guillaume Pagès