Merge branch 'nm/stash-untracked' into next

diff --git a/wt-status.h b/wt-status.h
index 8a3864783b039d92454cfda1c2ef2457e737cddd..64f4d33ea183c1a6e700f1f6667b83f0e904773e 100644 (file)
--- a/wt-status.h
+++ b/wt-status.h
@@ -76,7 +76,9 @@ struct wt_status {
        char color_palette[WT_STATUS_MAXSLOT][COLOR_MAXLEN];
        unsigned colopts;
        int null_termination;
+       int commit_template;
        int show_branch;
+       int show_stash;
        int hints;
 
        enum wt_status_format status_format;