{"thread":{"id":"39427","subject":"Implementation of git rebase --status","startedAt":"2015-05-26T14:38:01Z","lastAt":"2015-05-26T18:21:33Z","messageCount":3,"participants":["Guillaume Pages","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"262127","messageId":"2024498388.1201300.1432651081110.JavaMail.zimbra@ensimag.grenoble-inp.fr","threadId":"39427","inReplyTo":"1086316854.1201217.1432650834727.JavaMail.zimbra@ensimag.grenoble-inp.fr","subject":"Implementation of git rebase --status","fromName":"Guillaume Pages","fromEmail":"guillaume.pages@ensimag.grenoble-inp.fr","sentAt":"2015-05-26T14:38:01Z","receivedAt":"2015-05-26T14:38:01Z","isPatch":false,"sender":{"key":"guillaume.pages@ensimag.grenoble-inp.fr","avatar":null},"body":"Hi, \n\nI would like to implement a new command git rebase --status to inform the user \nabout the current rebase session. Here is a sample of what I think it could \nlook like in case of merge conflict: \n\ngit rebase --status \nYou are in the middle of a rebase session. \nThe line that paused this session is: \npick 848a16f commit with conflicts \nCONFLICT (content): Merge conflict in file1 \nConsult and edit remaining actions with git rebase --edit-todo \n\nIn case of syntax error: \n\ngit rebase --status \nYou are in the middle of a rebase session. \nThe line that paused this session is: \ntick 848a16f syntax error \nSYNTAX ERROR \nConsult and edit remaining actions with git rebase --edit-todo \n\nIn case of error during the execution of a script: \n\ngit rebase --status \nYou are in the middle of a rebase session. \nThe line that paused this session is: \nexec exit 3 \nERROR IN SCRIPT EXECUTION \nConsult and edit remaining actions with git rebase --edit-todo \n\nDo you think it could be usefull or do you have any suggestion? \n\nThanks, \n\nGuillaume Pagès \n"},{"id":"262133","messageId":"xmqqiobfl38p.fsf@gitster.dls.corp.google.com","threadId":"39427","inReplyTo":"2024498388.1201300.1432651081110.JavaMail.zimbra@ensimag.grenoble-inp.fr","subject":"Re: Implementation of git rebase --status","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2015-05-26T16:20:38Z","receivedAt":"2015-05-26T16:20:38Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Guillaume Pages <guillaume.pages@ensimag.grenoble-inp.fr> writes:\n\n> Do you think it could be usefull or do you have any suggestion? \n\nAll of your examples say things like:\n\n    > You are in the middle of a rebase session. \n    > The line that paused this session is: \n\nbut what if there is no such \"line\"?\n\nIOW, what does the user see when using this new option during a \"git\nrebase\" (not \"git rebase -i\")?\n\nOther than that, sounds like a neat thing to do.\n"},{"id":"262145","messageId":"1778818097.1210126.1432664493400.JavaMail.zimbra@ensimag.grenoble-inp.fr","threadId":"39427","inReplyTo":"xmqqiobfl38p.fsf@gitster.dls.corp.google.com","subject":"Re: Implementation of git rebase --status","fromName":"Guillaume Pages","fromEmail":"guillaume.pages@ensimag.grenoble-inp.fr","sentAt":"2015-05-26T18:21:33Z","receivedAt":"2015-05-26T18:21:33Z","isPatch":false,"sender":{"key":"guillaume.pages@ensimag.grenoble-inp.fr","avatar":null},"body":"\nJunio C Hamano <gitster@pobox.com> writes:\n\n>Guillaume Pages <guillaume.pages@ensimag.grenoble-inp.fr> writes: \n\n>> Do you think it could be useful or do you have any suggestion? \n\n>All of your examples say things like: \n\n>> You are in the middle of a rebase session. \n>> The line that paused this session is: \n\n>but what if there is no such \"line\"? \n\n>IOW, what does the user see when using this new option during a \"git \n>rebase\" (not \"git rebase -i\")? \n\nI guess it should display the sha1 of the patch that failed in this case.\n\n>Other than that, sounds like a neat thing to do. \n"}]}