Merge git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/wt-status.c b/wt-status.c
index daba9a6105882c671edd7da21f0a9ae34fbdaaa4..b7250e43100244abcdaa5bc923574aad7f815d0b 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -335,7 +335,7 @@ void wt_status_print(struct wt_status *s)
                if (s->amend)
                        printf("# No changes\n");
                else if (s->workdir_dirty)
-                       printf("no changes added to commit (use \"git add\" and/or \"git commit [-a|-i|-o]\")\n");
+                       printf("no changes added to commit (use \"git add\" and/or \"git commit -a\")\n");
                else if (s->workdir_untracked)
                        printf("nothing added to commit but untracked files present (use \"git add\" to track)\n");
                else if (s->is_initial)