aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattias Andrée <maandree@operamail.com>2013-10-25 18:24:36 +0200
committerMattias Andrée <maandree@operamail.com>2013-10-25 18:24:36 +0200
commit00d399cd067dc149f6014010728f17a689f557b4 (patch)
tree169e42fab95882aab677a702a8245bf5e62c005c
parentm (diff)
downloadusing-git-00d399cd067dc149f6014010728f17a689f557b4.tar.gz
using-git-00d399cd067dc149f6014010728f17a689f557b4.tar.bz2
using-git-00d399cd067dc149f6014010728f17a689f557b4.tar.xz
remove a paraphrase separation
Signed-off-by: Mattias Andrée <maandree@operamail.com>
-rw-r--r--using-git.texinfo5
1 files changed, 2 insertions, 3 deletions
diff --git a/using-git.texinfo b/using-git.texinfo
index 26f9bcd..7beac25 100644
--- a/using-git.texinfo
+++ b/using-git.texinfo
@@ -868,7 +868,6 @@ you want to see the changes.
Git has four trees should know about
to better understand how Git works.
-
The first tree you encounter is the
working directory, called the working
tree in Git. The tree begins in the
@@ -929,10 +928,10 @@ git rm FILE # Remove FILE
git mv FILE NEW_NAME # Rename FILE to NEW_NAME
@end example
-If an directory in becomes empty
+If a directory becomes empty
in the working directory it is
automatically removed from working
-directory. And directories are never
+directory. Directories are never
tracked by Git, so you cannot have
an empty directory in a commit.