Merge pull request #337 from mvdw/patch-1

There is no contradiction, so no "but".

Author: ben

book/01-introduction/sections/basics.asc

@@ -103,6 +103,6 @@ The basic Git workflow goes something like this:
 3. You do a commit, which takes the files as they are in the staging area and stores that snapshot permanently to your Git directory.
 
 If a particular version of a file is in the Git directory, it's considered committed.
-If it's modified but has been added to the staging area, it is staged.
+If it has been modified and was added to the staging area, it is staged.
 And if it was changed since it was checked out but has not been staged, it is modified.
 In <<_git_basics_chapter>>, you'll learn more about these states and how you can either take advantage of them or skip the staged part entirely.