summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/git-annex-add.mdwn14
-rw-r--r--doc/todo/--batch_for_add.mdwn4
2 files changed, 16 insertions, 2 deletions
diff --git a/doc/git-annex-add.mdwn b/doc/git-annex-add.mdwn
index 382ea1e6f..5f1ab33b0 100644
--- a/doc/git-annex-add.mdwn
+++ b/doc/git-annex-add.mdwn
@@ -8,8 +8,9 @@ git annex add `[path ...]`
# DESCRIPTION
-Adds files in the path to the annex. If no path is specified, adds
-files from the current directory and below.
+Adds the specified files to the annex. If a directory is specified,
+acts on all files inside the directory and its subdirectories.
+If no path is specified, adds files from the current directory and below.
Files that are already checked into git and are unmodified, or that
git has been configured to ignore will be silently skipped.
@@ -59,6 +60,15 @@ annexed content, and other symlinks.
Enable JSON output. This is intended to be parsed by programs that use
git-annex. Each line of output is a JSON object.
+* `--batch`
+
+ Enables batch mode, in which a file to add is read in a line from stdin,
+ the file is added, and repeat.
+
+ Note that if a file is skipped (due to not existing, being gitignored,
+ already being in git etc), an empty line will be output instead of the
+ normal output produced when adding a file.
+
# SEE ALSO
[[git-annex]](1)
diff --git a/doc/todo/--batch_for_add.mdwn b/doc/todo/--batch_for_add.mdwn
index 1f009074b..c0450c11f 100644
--- a/doc/todo/--batch_for_add.mdwn
+++ b/doc/todo/--batch_for_add.mdwn
@@ -1,3 +1,7 @@
should be extremely helpful when adding many files one at a time ;)
[[!meta author=yoh]]
+
+> Implemented; made it not recurse into directories and output a blank line
+> if it doesn't add the file, so there's aways 1 line of output for each
+> input. [[done]] --[[Joey]]