summaryrefslogtreecommitdiffstats
path: root/wt-status.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-06-30 13:45:22 -0700
committerJunio C Hamano <gitster@pobox.com>2017-06-30 13:45:22 -0700
commit7e46f19a105f3798b03ac3887f45034fbfdff676 (patch)
treef258b34d49b1e01d41e6de033e091335359cb9a8 /wt-status.h
parentc7ee0baae7e874898032ab0c63600951eb7c2d18 (diff)
parent4ddb1354e8d5daf5671d3d451a67d2d1e82d9b49 (diff)
downloadgit-7e46f19a105f3798b03ac3887f45034fbfdff676.tar.gz
git-7e46f19a105f3798b03ac3887f45034fbfdff676.tar.xz
Merge branch 'ks/status-initial-commit'
"git status" has long shown essentially the same message as "git commit"; the message it gives while preparing for the root commit, i.e. "Initial commit", was hard to understand for some new users. Now it says "No commits yet" to stress more on the current status (rather than the commit the user is preparing for, which is more in line with the focus of "git commit"). * ks/status-initial-commit: status: contextually notify user about an initial commit
Diffstat (limited to 'wt-status.h')
-rw-r--r--wt-status.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/wt-status.h b/wt-status.h
index d8ae2e590..64f4d33ea 100644
--- a/wt-status.h
+++ b/wt-status.h
@@ -76,6 +76,7 @@ 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;