Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix output of git status after checking out file #555

Merged
merged 2 commits into from Jan 18, 2019
Merged

Fix output of git status after checking out file #555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ca5b1c
Fix output of git status after checking out file
jaanos Sep 13, 2018
fc70138
Fix grammar, add hyphen
jaanos Sep 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 4 additions & 8 deletions _episodes/05-history.md
View file
Open in desktop
Expand Up @@ -255,16 +255,12 @@ $ git status
{: .language-bash}

~~~
# On branch master
On branch master
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
# 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: mars.txt
#
no changes added to commit (use "git add" and/or "git commit -a")

modified: mars.txt

~~~
{: .output}

Expand Down
4 changes: 2 additions & 2 deletions _extras/discuss.md
View file
Open in desktop
Expand Up @@ -446,8 +446,8 @@ Changes to be committed:
~~~
{: .output}

Notice how Git has now figure out that the `krypton.txt` has not
disappeared it has simply been renamed.
Notice how Git has now figured out that the `krypton.txt` has not
disappeared - it has simply been renamed.

The final step, as before, is to commit our change to the repository:

Expand Down