Re: [PATCH 3/4] status: give more information during rebase -i

Junio C Hamano gits...@pobox.com writes: Guillaume Pagès guillaume.pa...@ensimag.grenoble-inp.fr writes: git status gives more information during rebase -i, about the list of command that are done during the rebase. It displays the two last commands executed and the two next lines to be

Re: [PATCH 1/4] status: factor two rebase-related messages together

Junio C Hamano gits...@pobox.com writes: Hmmm, it obviously does not break anything but it is not obvious why this is a good change. Is it that you wanted to have a single instance of if on a branch, we say 'you are rebasing that branch', otherwise we say 'you are rebasing'? Even then, I am

Re: [PATCH 3/4] status: give more information during rebase -i

Junio C Hamano gits...@pobox.com writes Matthieu Moy matthieu@grenoble-inp.fr writes: +void get_two_last_lines(char *filename, int *numlines, char **lines) +{ +... +} + +void get_two_first_lines(char *filename, int *numlines, char **lines) +{ +... +} I had a handful of

Re: [RFC/PATCH 2/2] status: fix tests to handle new verbose git status during rebase

Thanks for reviewing, I take everything into account and release a v2 ASAP. Guillaume -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

[BUG] potential error in parsing git checkout options?

Git version : 2.4.1.652.g8fd8657 When we run git checkout -babar, we would expect an error message like unknown switch 'a' and we get Switched to a new branch 'abar'. We are not sure since we don't entirely understand the syntax -b branch which is shown in the documentation, but as average

Re: [RFC/PATCH v2] create a skeleton for the command git rebase --status

After this discussion I eventually agree that it would be better upgrading git status than creating a new command.When people use git status, it means that they need information to continue their work, so if you don't even know that you are in a rebase, you will very likely need information about

Re: Implementation of git rebase --status

Junio C Hamano gits...@pobox.com writes: Guillaume Pages guillaume.pa...@ensimag.grenoble-inp.fr writes: Do you think it could be useful or do you have any suggestion? All of your examples say things like: You are in the middle of a rebase session. The line that paused this session

Implementation of git rebase --status

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