summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/git-annex-config.mdwn7
-rw-r--r--doc/git-annex.mdwn4
-rw-r--r--doc/todo/wishlist__58___per-repository_autocommit__61__false.mdwn2
3 files changed, 9 insertions, 4 deletions
diff --git a/doc/git-annex-config.mdwn b/doc/git-annex-config.mdwn
index 1e1819bb7..a6b7eb578 100644
--- a/doc/git-annex-config.mdwn
+++ b/doc/git-annex-config.mdwn
@@ -25,9 +25,12 @@ Only a few make sense to be able to set such that all clones of a
repository see the setting, and so git-annex only looks for these:
These settings can be overridden on a per-repository basis using
-`git config`:
+`git config`.
-None yet!
+* `annex.autocommit`
+
+ Set to false to prevent the git-annex assistant and git-annex sync
+ from automatically committing changes to files in the repository.
# EXAMPLE
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index af6342164..2763de22d 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -1006,8 +1006,8 @@ Here are all the supported configuration settings.
Set to false to prevent the git-annex assistant and git-annex sync
from automatically committing changes to files in the repository.
- To configure the behavior in all repositories, this can be set in
- [[git-annex-config]].
+ To configure the behavior in all clones of the repository,
+ this can be set in [[git-annex-config]].
* `annex.startupscan`
diff --git a/doc/todo/wishlist__58___per-repository_autocommit__61__false.mdwn b/doc/todo/wishlist__58___per-repository_autocommit__61__false.mdwn
index a71aaa363..40cdb0096 100644
--- a/doc/todo/wishlist__58___per-repository_autocommit__61__false.mdwn
+++ b/doc/todo/wishlist__58___per-repository_autocommit__61__false.mdwn
@@ -3,3 +3,5 @@ when using git-annex as a minority participant in a repository (eg. because in a
forgetting to do that explicit configuration results, in one sync command, easily results in an unwanted implicit commit that's pushed across remotes.
could there be a per-repository option (somewhere around .gitattributes, or maybe in the git-annex branch) that disables autocommits for the repository?
+
+> [[done]] --[[Joey]]