summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-11-07 15:22:45 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-11-07 15:22:45 -0400
commitb1c19cedab246eb1606be58624b56218a1c4813c (patch)
treedf2216e08d95dc15be66b52373d504700e4c551e
parentcbd2133974a3a848fd25a95b52f1a17d220d5938 (diff)
improve docs
-rw-r--r--doc/bugs/Discrepancy_between_git_annex_add_and_git_annex_watch.mdwn2
-rw-r--r--doc/git-annex.mdwn8
2 files changed, 10 insertions, 0 deletions
diff --git a/doc/bugs/Discrepancy_between_git_annex_add_and_git_annex_watch.mdwn b/doc/bugs/Discrepancy_between_git_annex_add_and_git_annex_watch.mdwn
index 611a3d611..8e836e345 100644
--- a/doc/bugs/Discrepancy_between_git_annex_add_and_git_annex_watch.mdwn
+++ b/doc/bugs/Discrepancy_between_git_annex_add_and_git_annex_watch.mdwn
@@ -29,3 +29,5 @@ git-annex version: 4.20131101, ubuntu 12.04 with all updates.
# End of transcript or log.
"""]]
+
+> Improved documentation. [[done]] --[[Joey]]
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index 25b69930e..031f8eb84 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -260,6 +260,14 @@ subdirectories).
background, you no longer need to manually run git commands when
manipulating your files.
+ By default, all files in the directory will be added to the repository.
+ (Including dotfiles.) To block some files from being added, use
+ `.gitignore` files.
+
+ By default, all files that are added are added to the annex, the same
+ as when you run `git annex add`. If you configure annex.largefiles,
+ files that it does not match will instead be added with `git add`.
+
To not daemonize, run with `--foreground` ; to stop a running daemon,
run with `--stop`