summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2017-08-17 11:01:27 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2017-08-17 11:01:27 -0400
commit273f514e5a3026366cf548ca528bd0ce835124b8 (patch)
treefacbd0329ebe234d1e358a0b5334662ab88fc500
parent1fe450e89a914bb40ad1efa53fc15b881c686544 (diff)
parent6338372940ad33a069de0c3d584e7ec14a83b88b (diff)
Merge branch 'master' of ssh://git-annex.branchable.com
-rw-r--r--doc/forum/Assistant_-_pausing___47___using_lock_file_to_get_atomic__40__ish__41___states__63__/comment_1_44c97c54066ca0487d8903cc01a356a3._comment10
-rw-r--r--doc/forum/Assistant_-_pausing___47___using_lock_file_to_get_atomic__40__ish__41___states__63__/comment_2_98eb671596e84466e24004f55724660a._comment8
2 files changed, 18 insertions, 0 deletions
diff --git a/doc/forum/Assistant_-_pausing___47___using_lock_file_to_get_atomic__40__ish__41___states__63__/comment_1_44c97c54066ca0487d8903cc01a356a3._comment b/doc/forum/Assistant_-_pausing___47___using_lock_file_to_get_atomic__40__ish__41___states__63__/comment_1_44c97c54066ca0487d8903cc01a356a3._comment
new file mode 100644
index 000000000..42f21761f
--- /dev/null
+++ b/doc/forum/Assistant_-_pausing___47___using_lock_file_to_get_atomic__40__ish__41___states__63__/comment_1_44c97c54066ca0487d8903cc01a356a3._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="olaf"
+ avatar="http://cdn.libravatar.org/avatar/4ae498d3d6ee558d6b65caa658f72572"
+ subject="manual mode?"
+ date="2017-08-17T07:35:41Z"
+ content="""
+It looks like setting the repo to 'manual mode' is sufficient. I just need to then remember to `git annex add` to ensure everything is committed.
+
+Not ideal, but...
+"""]]
diff --git a/doc/forum/Assistant_-_pausing___47___using_lock_file_to_get_atomic__40__ish__41___states__63__/comment_2_98eb671596e84466e24004f55724660a._comment b/doc/forum/Assistant_-_pausing___47___using_lock_file_to_get_atomic__40__ish__41___states__63__/comment_2_98eb671596e84466e24004f55724660a._comment
new file mode 100644
index 000000000..7478367b9
--- /dev/null
+++ b/doc/forum/Assistant_-_pausing___47___using_lock_file_to_get_atomic__40__ish__41___states__63__/comment_2_98eb671596e84466e24004f55724660a._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="CandyAngel"
+ avatar="http://cdn.libravatar.org/avatar/15c0aade8bec5bf004f939dd73cf9ed8"
+ subject="comment 2"
+ date="2017-08-17T10:22:54Z"
+ content="""
+You might also want to check out the annex.alwayscommit and annex.autocommit options.
+"""]]