Le 26/05/2012 15:01, Nguyen Thai Ngoc Duy a écrit :
Indeed, the advices are a bit long and could be restricted to the information about the current state but the idea is also to give the user a way to know what to do next. For long messages, such as the rebase case, we could actually use the advice_status_hints+ if(rebase_state || rebase_interactive_state) { + if (conflict) { + status_printf_ln(s, c, _("You are currently rebasing: fix conflicts and then run \"git rebase -- continue\".")); + status_printf_ln(s, c, _("If you would prefer to skip this patch, instead run \"git rebase --skip\".")); + status_printf_ln(s, c, _("To check out the original branch and stop rebasing run \"git rebase --abort\".")); + } + else { + if (rebase_state) + status_printf_ln(s, c, _("You are currently rebasing: all conflicts fixed; run \"git rebase --continue\".")); + else { + status_printf_ln(s, c, _("You are currently editing in a rebase progress.")); + status_printf_ln(s, c, _("You can amend the commit with")); + status_printf_ln(s, c, _(" git commit --amend")); + status_printf_ln(s, c, _("Once you are satisfied with your changes, run")); + status_printf_ln(s, c, _(" git rebase --continue")); + } + } + wt_status_print_trailer(s); + }Should this verbose advice be controlled by advice.* config keys? Experienced users know by heart what to do and will appreciate screen estate being used more helpful (to them) info
variable to display what to do next or not. Kong Lucien <Lucien.Kong@xxxxxxxxxxxxxxx> Nguy Thomas <Thomas.Nguy@xxxxxxxxxxxxxxx> Duperray Valentin <Valentin.Duperray@xxxxxxxxxxxxxxx> Jonas Franck <Franck.Jonas@xxxxxxxxxxxxxxx> Nguyen Huynh Khoi Nguyen <Huynh-Khoi-Nguyen.Nguyen@xxxxxxxxxxxxxxx> -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html