From 1dd0e7280228efc09e0080d2cf8ea7970a3ec4a0 Mon Sep 17 00:00:00 2001
From: Mattias Andrée <maandree@operamail.com>
Date: Fri, 16 Aug 2013 10:14:11 +0200
Subject: add file operations
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mattias Andrée <maandree@operamail.com>
---
 using-git.texinfo | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 76 insertions(+)

(limited to 'using-git.texinfo')

diff --git a/using-git.texinfo b/using-git.texinfo
index 74bf8b9..2dc82d8 100644
--- a/using-git.texinfo
+++ b/using-git.texinfo
@@ -619,6 +619,7 @@ you want to see the changes.
 
 @menu
 * The trees of Git::
+* File operations::
 @end menu
 
 
@@ -666,6 +667,81 @@ in the leaves, your branches.
 
 
 
+@node File operations
+@section File operations
+
+Their are four basic options you can
+do on files: add, update, remove and
+rename, adding and update is done
+with the same command:
+
+@example
+git add FILE
+@end example
+
+To remove a file or rename a file,
+just do as you normally would without
+git, but prepand @code{git}:
+
+@example
+git rm FILE           # Remove FILE
+git mv FILE NEW_NAME  # Rename FILE to NEW_NAME
+@end example
+
+If an directory in becomes empty
+in the working directory it is
+automatically removed from working
+directory. And directories are never
+tracked by Git, so you cannot have
+an empty directory in a commit.
+
+You can also use @command{git add -u}
+@footnote{@option{-u} is the short
+option for @option{--update}.} to
+stage an edit in an already tracked
+file or stage the removal of it
+if it as been removed from the
+working directory.
+
+A caveat with @command{git mv} is
+that is that is that same thing as
+typing:
+
+@example
+cp FILE NEW_NAME
+git rm FILE
+git add NEW_NAME
+@end example
+
+In other words, the history for
+the file is reset and if you do
+this at the same time someone
+edits the file you will get a
+merge conflict.
+
+This is not a problem with GNU
+Arch because it keeps track of
+which file is which by giving
+it an unique identifier, and you
+may think that would have been
+a good think. But if the content
+of the file depends on the file's
+name, or the other way around,
+and a line with such dependency
+is added, the file's content
+would become bad. Well it is
+debatable since the case could
+be that another file depends on
+the renamed files name, and
+someone could make a change in
+that file. But fixing a merge
+conflict when you have only
+renamed the file is not too hard
+and it eliminates a potatial
+maintenance miss.
+
+
+
 @node GNU Free Documentation License
 @appendix GNU Free Documentation License
 @include fdl.texinfo
-- 
cgit v1.2.3-70-g09d2