Skip to content

git status の出力を参照する本文に誤り #8

Open
@harupong

Description

@harupong
  • Upstream に報告する

chapter2

ref #3

The "CONTRIBUTING.md" file appears under a section named "Changed but not staged for commit" – which means that a file that is tracked has been modified in the working directory but not yet staged.
https://github.com/progit/progit2-ja/pull/3/files#diff-8aa4fa68fe2a895582ab822f2d96680fL108

"Changed but not staged for commit" should be "Changes not staged for commit"

If you simply remove the file from your working directory, it shows up under the "Changed but not updated" (that is, unstaged) area of your git status output:
https://github.com/progit/progit2-ja/pull/3/files#diff-8aa4fa68fe2a895582ab822f2d96680fL466

"Changed but not updated" should be "Changes not staged for commit" , なんだけれど、ここはこのままでも不可ではない

chapter7

1st

[source,console]
----
$ git stash apply
# On branch master
# Changed but not updated:
#   (use "git add <file>..." to update what will be committed)
#
#      modified:   index.html
#      modified:   lib/simplegit.rb
#
----

↑v2

> git stash apply
Auto-merging book/07-git-tools/sections/interactive-staging.asc
On branch translate-ch07

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)

        modified:   book/07-git-tools/sections/interactive-staging.asc

no changes added to commit (use "git add" and/or "git commit -a")
>

↑ git version 1.9.4.msysgit.1

2nd

[source,console]
----
$ git stash apply --index
# On branch master
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#      modified:   index.html
#
# Changed but not updated:
#   (use "git add <file>..." to update what will be committed)
#
#      modified:   lib/simplegit.rb
#
----

↑v2

3rd

[source,console]
----
$ git stash branch testchanges
Switched to a new branch "testchanges"
# On branch testchanges
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#      modified:   index.html
#
# Changed but not updated:
#   (use "git add <file>..." to update what will be committed)
#
#      modified:   lib/simplegit.rb
#
Dropped refs/stash@{0} (f0dfc4d5dc332d1cee34a634182e168c4efc3359)
----

↑v2

Metadata

Metadata

Assignees

No one assigned

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions