Better "Changed but not updated" message in git-status
Older Gits talked about "updating" a file to add its content to the index, but this terminology is confusing for new users. "to stage" is far more intuitive and already used in e.g. the "git stage" command name. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Matthieu Moy committed
Nov 2, 2010 at 16:31 UTC
8009d83c7e7af0a298ef858609a8201d01086396
3 files changed
+19
-19
Documentation/gittutorial-2.txt
+1
-1
@@ -373,7 +373,7 @@ $ git status
373
#
374
# new file: closing.txt
375
#
376
-# Changed but not updated:
376
+# Changes not staged for commit:
377
# (use "git add <file>..." to update what will be committed)
378
#
379
# modified: file.txt
t/t7508-status.sh
+17
-17
@@ -44,7 +44,7 @@ cat >expect <<\EOF
44
#
45
# new file: dir2/added
46
#
47
-# Changed but not updated:
47
+# Changes not staged for commit:
48
# (use "git add <file>..." to update what will be committed)
49
# (use "git checkout -- <file>..." to discard changes in working directory)
50
#
@@ -73,7 +73,7 @@ cat >expect <<\EOF
73
# Changes to be committed:
74
# new file: dir2/added
75
#
76
-# Changed but not updated:
76
+# Changes not staged for commit:
77
# modified: dir1/modified
78
#
79
# Untracked files:
@@ -140,7 +140,7 @@ cat >expect <<EOF
140
#
141
# new file: dir2/added
142
#
143
-# Changed but not updated:
143
+# Changes not staged for commit:
144
# (use "git add <file>..." to update what will be committed)
145
# (use "git checkout -- <file>..." to discard changes in working directory)
146
#
@@ -167,7 +167,7 @@ cat >expect <<EOF
167
# Changes to be committed:
168
# new file: dir2/added
169
#
170
-# Changed but not updated:
170
+# Changes not staged for commit:
171
# modified: dir1/modified
172
#
173
# Untracked files not listed
@@ -202,7 +202,7 @@ cat >expect <<EOF
202
#
203
# new file: dir2/added
204
#
205
-# Changed but not updated:
205
+# Changes not staged for commit:
206
# (use "git add <file>..." to update what will be committed)
207
# (use "git checkout -- <file>..." to discard changes in working directory)
208
#
@@ -260,7 +260,7 @@ cat >expect <<EOF
260
#
261
# new file: dir2/added
262
#
263
-# Changed but not updated:
263
+# Changes not staged for commit:
264
# (use "git add <file>..." to update what will be committed)
265
# (use "git checkout -- <file>..." to discard changes in working directory)
266
#
@@ -320,7 +320,7 @@ cat >expect <<\EOF
320
#
321
# new file: ../dir2/added
322
#
323
-# Changed but not updated:
323
+# Changes not staged for commit:
324
# (use "git add <file>..." to update what will be committed)
325
# (use "git checkout -- <file>..." to discard changes in working directory)
326
#
@@ -392,7 +392,7 @@ cat >expect <<\EOF
392
#
393
# <GREEN>new file: dir2/added<RESET>
394
#
395
-# Changed but not updated:
395
+# Changes not staged for commit:
396
# (use "git add <file>..." to update what will be committed)
397
# (use "git checkout -- <file>..." to discard changes in working directory)
398
#
@@ -521,7 +521,7 @@ cat >expect <<\EOF
521
#
522
# new file: dir2/added
523
#
524
-# Changed but not updated:
524
+# Changes not staged for commit:
525
# (use "git add <file>..." to update what will be committed)
526
# (use "git checkout -- <file>..." to discard changes in working directory)
527
#
@@ -614,7 +614,7 @@ cat >expect <<EOF
614
# new file: dir2/added
615
# new file: sm
616
#
617
-# Changed but not updated:
617
+# Changes not staged for commit:
618
# (use "git add <file>..." to update what will be committed)
619
# (use "git checkout -- <file>..." to discard changes in working directory)
620
#
@@ -673,7 +673,7 @@ cat >expect <<EOF
673
# new file: dir2/added
674
# new file: sm
675
#
676
-# Changed but not updated:
676
+# Changes not staged for commit:
677
# (use "git add <file>..." to update what will be committed)
678
# (use "git checkout -- <file>..." to discard changes in working directory)
679
#
@@ -718,7 +718,7 @@ test_expect_success 'status -s submodule summary' '
718
719
cat >expect <<EOF
720
# On branch master
721
-# Changed but not updated:
721
+# Changes not staged for commit:
722
# (use "git add <file>..." to update what will be committed)
723
# (use "git checkout -- <file>..." to discard changes in working directory)
724
#
@@ -766,7 +766,7 @@ cat >expect <<EOF
766
# new file: dir2/added
767
# new file: sm
768
#
769
-# Changed but not updated:
769
+# Changes not staged for commit:
770
# (use "git add <file>..." to update what will be committed)
771
# (use "git checkout -- <file>..." to discard changes in working directory)
772
#
@@ -819,7 +819,7 @@ cat > expect << EOF
819
#
820
# modified: sm
821
#
822
-# Changed but not updated:
822
+# Changes not staged for commit:
823
# (use "git add <file>..." to update what will be committed)
824
# (use "git checkout -- <file>..." to discard changes in working directory)
825
#
@@ -931,7 +931,7 @@ cat > expect << EOF
931
#
932
# modified: sm
933
#
934
-# Changed but not updated:
934
+# Changes not staged for commit:
935
# (use "git add <file>..." to update what will be committed)
936
# (use "git checkout -- <file>..." to discard changes in working directory)
937
# (commit or discard the untracked or modified content in submodules)
@@ -989,7 +989,7 @@ cat > expect << EOF
989
#
990
# modified: sm
991
#
992
-# Changed but not updated:
992
+# Changes not staged for commit:
993
# (use "git add <file>..." to update what will be committed)
994
# (use "git checkout -- <file>..." to discard changes in working directory)
995
#
@@ -1067,7 +1067,7 @@ test_expect_success ".git/config ignore=dirty doesn't suppress submodule summary
1067
1068
cat > expect << EOF
1069
# On branch master
1070
-# Changed but not updated:
1070
+# Changes not staged for commit:
1071
# (use "git add <file>..." to update what will be committed)
1072
# (use "git checkout -- <file>..." to discard changes in working directory)
1073
#
wt-status.c
+1
-1
@@ -88,7 +88,7 @@ static void wt_status_print_dirty_header(struct wt_status *s,
88
{
89
const char *c = color(WT_STATUS_HEADER, s);
90
91
- color_fprintf_ln(s->fp, c, "# Changed but not updated:");
91
+ color_fprintf_ln(s->fp, c, "# Changes not staged for commit:");
92
if (!advice_status_hints)
93
return;
94
if (!has_deleted)