diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/bugs/Installation_fails:___34__Duplicate_instance_declarations__34__.mdwn | 2 | ||||
| -rw-r--r-- | doc/bugs/sync_does_not_commit_with_alwasycommit___61___false.mdwn | 5 | ||||
| -rw-r--r-- | doc/git-annex.mdwn | 8 |
3 files changed, 12 insertions, 3 deletions
diff --git a/doc/bugs/Installation_fails:___34__Duplicate_instance_declarations__34__.mdwn b/doc/bugs/Installation_fails:___34__Duplicate_instance_declarations__34__.mdwn index 6e9c42ad3..db02036f4 100644 --- a/doc/bugs/Installation_fails:___34__Duplicate_instance_declarations__34__.mdwn +++ b/doc/bugs/Installation_fails:___34__Duplicate_instance_declarations__34__.mdwn @@ -31,3 +31,5 @@ git-annex-5.20140709, Fedora 20 # End of transcript or log. """]] + +> Already fixed in git yesterday. [[done]] --[[Joey]] diff --git a/doc/bugs/sync_does_not_commit_with_alwasycommit___61___false.mdwn b/doc/bugs/sync_does_not_commit_with_alwasycommit___61___false.mdwn index c48312fbd..5f43a8f93 100644 --- a/doc/bugs/sync_does_not_commit_with_alwasycommit___61___false.mdwn +++ b/doc/bugs/sync_does_not_commit_with_alwasycommit___61___false.mdwn @@ -83,3 +83,8 @@ The following script (available at <https://gist.github.com/gioele/5ffeff8988a53 ### What version of git-annex are you using? On what operating system? git-annex version: 5.20140708-g8c9c55c on Ubuntu 12.04.4 + +> I have improved the documentation to not imply that sync/merge are a +> special case. They honor the autocommit settings more or less +> intentionally, and to get a commit to be made, just pass -c +> autocommit=true when running them. --[[Joey]] diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn index 6dde7c516..2d114e7ff 100644 --- a/doc/git-annex.mdwn +++ b/doc/git-annex.mdwn @@ -1398,9 +1398,11 @@ Here are all the supported configuration settings. * `annex.alwayscommit` By default, git-annex automatically commits data to the git-annex branch - after each command is run. To disable these commits, - set to `false`. Then data will only be committed when - running `git annex merge` (or by automatic merges) or `git annex sync`. + after each command is run. If you have a series + of commands that you want to make a single commit, you can + run the commands with `-c annex.alwayscommit=false`. You can later + commit the data by running `git annex merge` (or by automatic merges) + or `git annex sync`. * `annex.delayadd` |