Merge pull request #713 from progit/fix_final_state_bzr

The repo needs a reset after the import from bzr

Author: ben

book/09-git-and-other-scms/sections/import-bzr.asc

@@ -72,7 +72,8 @@ $ bzr fast-export --plain . | git fast-import
 
 Depending on the size of the project, your Git repository is built in a lapse from a few seconds to a few minutes.
 
-At this point, the `.git` directory and your working tree are all set up, but Git's index isn't synchronised with the working tree:
+At this point, the `.git` directory and your working tree are all set up, but the working tree and the index are not synchronized with HEAD:
+
 [source,console]
 ----
 $ git status
@@ -83,17 +84,13 @@ Changes that will be validated:
         removed :        .bzrignore
         removed :        file.txt
 
-Untracked files:
-  (use "git add <fichier>..." to include in what will be validated)
-
-        .bzr/
-        .bzrignore
-        file.txt
 ----
-Type this to fix that:
+
+This is fixed by typing:
+
 [source,console]
 ----
-$ git reset HEAD .
+$ git reset --hard HEAD
 ----
 
 Now let us have a look at the files to ignore.
@@ -152,4 +149,11 @@ git fast-import --import-marks=../marks.git --export-marks=../marks.git
 Now `git branch` shows you the `master` branch as well as the `work` branch.
 Check the logs to make sure they’re complete and get rid of the `marks.bzr` and `marks.git` files.
 
+Your working copy is still unsynchronized, so let's reset it:
+
+[source,console]
+----
+$ git reset --hard HEAD
+----
+
 Your Git repository is ready to use.