mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-24 02:17:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Better "Changed but not updated" message in git-status

Browse Source 
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>
This commit is contained in:
Matthieu Moy 2010-11-02 16:31:19 +01:00 committed by Junio C Hamano
parent 7ebee44167
commit 8009d83c7e
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/gittutorial-2.txt
View File

@ -373,7 +373,7 @@ $ git status
#
# new file: closing.txt
#
# Changed but not updated:
# Changes not staged for commit:
# (use "git add <file>..." to update what will be committed)
#
# modified: file.txt

34
t/t7508-status.sh
View File

@ -44,7 +44,7 @@ cat >expect <<\EOF
#
# new file: dir2/added
#
# Changed but not updated:
# Changes not staged for commit:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#
@ -73,7 +73,7 @@ cat >expect <<\EOF
# Changes to be committed:
# new file: dir2/added
#
# Changed but not updated:
# Changes not staged for commit:
# modified: dir1/modified
#
# Untracked files:
@ -140,7 +140,7 @@ cat >expect <<EOF
#
# new file: dir2/added
#
# Changed but not updated:
# Changes not staged for commit:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#
@ -167,7 +167,7 @@ cat >expect <<EOF
# Changes to be committed:
# new file: dir2/added
#
# Changed but not updated:
# Changes not staged for commit:
# modified: dir1/modified
#
# Untracked files not listed
@ -202,7 +202,7 @@ cat >expect <<EOF
#
# new file: dir2/added
#
# Changed but not updated:
# Changes not staged for commit:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#
@ -260,7 +260,7 @@ cat >expect <<EOF
#
# new file: dir2/added
#
# Changed but not updated:
# Changes not staged for commit:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#
@ -320,7 +320,7 @@ cat >expect <<\EOF
#
# new file: ../dir2/added
#
# Changed but not updated:
# Changes not staged for commit:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#
@ -392,7 +392,7 @@ cat >expect <<\EOF
#
# <GREEN>new file: dir2/added<RESET>
#
# Changed but not updated:
# Changes not staged for commit:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#
@ -521,7 +521,7 @@ cat >expect <<\EOF
#
# new file: dir2/added
#
# Changed but not updated:
# Changes not staged for commit:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#
@ -614,7 +614,7 @@ cat >expect <<EOF
# new file: dir2/added
# new file: sm
#
# Changed but not updated:
# Changes not staged for commit:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#
@ -673,7 +673,7 @@ cat >expect <<EOF
# new file: dir2/added
# new file: sm
#
# Changed but not updated:
# Changes not staged for commit:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#
@ -718,7 +718,7 @@ test_expect_success 'status -s submodule summary' '
cat >expect <<EOF
# On branch master
# Changed but not updated:
# Changes not staged for commit:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#
@ -766,7 +766,7 @@ cat >expect <<EOF
# new file: dir2/added
# new file: sm
#
# Changed but not updated:
# Changes not staged for commit:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#
@ -819,7 +819,7 @@ cat > expect << EOF
#
# modified: sm
#
# Changed but not updated:
# Changes not staged for commit:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#
@ -931,7 +931,7 @@ cat > expect << EOF
#
# modified: sm
#
# Changed but not updated:
# Changes not staged for commit:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
# (commit or discard the untracked or modified content in submodules)
@ -989,7 +989,7 @@ cat > expect << EOF
#
# modified: sm
#
# Changed but not updated:
# Changes not staged for commit:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#
@ -1067,7 +1067,7 @@ test_expect_success ".git/config ignore=dirty doesn't suppress submodule summary
cat > expect << EOF
# On branch master
# Changed but not updated:
# Changes not staged for commit:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#

2
wt-status.c
View File

@ -88,7 +88,7 @@ static void wt_status_print_dirty_header(struct wt_status *s,
{
const char *c = color(WT_STATUS_HEADER, s);
color_fprintf_ln(s->fp, c, "# Changed but not updated:");
color_fprintf_ln(s->fp, c, "# Changes not staged for commit:");
if (!advice_status_hints)
return;
if (!has_deleted)