[PATCH] Remove unnecessary git-rm --cached reference from status output
From: Juergen Ruehle <hidden>
Date: 2016-06-15 22:42:48
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: =?utf-8?q?J=C3=BCrgen_R=C3=BChle?= <redacted> Since git-reset has learned restoring the absence of paths git-rm --cached is no longer necessary. Therefore remove it from the cached content header hint. Also remove the unfortunate wording 'Cached' from the header itself. Signed-off-by: Jürgen Rühle <redacted> --- !!This is based on next (or the jr/status series)!! This does not yet implement the other proposed changes to the header lines, pending further feedback. wt-status.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/wt-status.c b/wt-status.c
index 8aac526..c48127d 100644
--- a/wt-status.c
+++ b/wt-status.c@@ -56,9 +56,9 @@ void wt_status_prepare(struct wt_status *s) static void wt_status_print_cached_header(const char *reference) { const char *c = color(WT_STATUS_HEADER); - color_printf_ln(c, "# Cached changes to be committed:"); + color_printf_ln(c, "# Changes to be committed:"); if (reference) { - color_printf_ln(c, "# (use \"git reset %s <file>...\" and \"git rm --cached <file>...\" to unstage)", reference); + color_printf_ln(c, "# (use \"git reset %s <file>...\" to unstage)", reference); } else { color_printf_ln(c, "# (use \"git rm --cached <file>...\" to unstage)"); }
--
1.5.0.rc0.g525e