File tree Expand file tree Collapse file tree 1 file changed +13
-9
lines changed
book/09-git-and-other-scms/sections Expand file tree Collapse file tree 1 file changed +13
-9
lines changed Original file line number Diff line number Diff line change @@ -72,7 +72,8 @@ $ bzr fast-export --plain . | git fast-import
7272
7373Depending on the size of the project, your Git repository is built in a lapse from a few seconds to a few minutes.
7474
75- 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:
75+ 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:
76+
7677[source,console]
7778----
7879$ git status
@@ -83,17 +84,13 @@ Changes that will be validated:
8384 removed : .bzrignore
8485 removed : file.txt
8586
86- Untracked files:
87- (use "git add <fichier>..." to include in what will be validated)
88-
89- .bzr/
90- .bzrignore
91- file.txt
9287----
93- Type this to fix that:
88+
89+ This is fixed by typing:
90+
9491[source,console]
9592----
96- $ git reset HEAD .
93+ $ git reset --hard HEAD
9794----
9895
9996Now 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
152149Now `git branch` shows you the `master` branch as well as the `work` branch.
153150Check the logs to make sure they’re complete and get rid of the `marks.bzr` and `marks.git` files.
154151
152+ Your working copy is still unsynchronized, so let's reset it:
153+
154+ [source,console]
155+ ----
156+ $ git reset --hard HEAD
157+ ----
158+
155159Your Git repository is ready to use.
You can’t perform that action at this time.
0 commit comments