This is almost identical to v5. I turned git_path(var) into git_path("%s", var) as Junio noticed, but I still prefer my version on the other points discussed. Guillaume Pagès (4): status: factor two rebase-related messages together status: differentiate interactive from non-interactive rebases status: give more information during rebase -i status: add new tests for status during rebase -i t/t7512-status-help.sh | 226 ++++++++++++++++++++++++++++++++++++++++++++++--- wt-status.c | 151 +++++++++++++++++++++++++++++---- 2 files changed, 346 insertions(+), 31 deletions(-) -- 2.5.0.rc0.7.ge1edd74.dirty -- 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