From 09abd294698c86cc10e00c27e9197afdba3411ec Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 7 Nov 2013 15:22:45 -0400 Subject: [PATCH] improve docs --- ...repancy_between_git_annex_add_and_git_annex_watch.mdwn | 2 ++ doc/git-annex.mdwn | 8 ++++++++ 2 files changed, 10 insertions(+) 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 611a3d6116..8e836e345f 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 25b69930ee..031f8eb84a 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`