summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2017-02-13 16:02:53 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2017-02-13 16:02:53 -0400
commit77c58ae75400ad7caa1c8aeca70501d120f6e87a (patch)
tree7fd029a31b4d52841202d202019f8f93cad681a1
parent6cba608c2b05c2b33f22b264d78a83e9a06ca402 (diff)
remove recent addition of receive.denyNonFastForwards to walkthrough
That is a dangerous setting, and not needed. I tried the walkthrough as it was without it, and syncing in the USB remote worked ok. There was a problem merging from origin/master, since that branch didn't exist yet, but that didn't prevent sync from working at all. To avoid even that problem, reordered the walkthrough, so files get committed to the repo before the remote gets set up. This commit was sponsored by Ole-Morten Duesund on Patreon.
-rw-r--r--doc/walkthrough.mdwn2
-rw-r--r--doc/walkthrough/creating_a_repository.mdwn1
2 files changed, 1 insertions, 2 deletions
diff --git a/doc/walkthrough.mdwn b/doc/walkthrough.mdwn
index b35cf808d..4745ca117 100644
--- a/doc/walkthrough.mdwn
+++ b/doc/walkthrough.mdwn
@@ -9,8 +9,8 @@ but following along will teach you the basic concepts from the ground up.
[[!inline feeds=no trail=yes show=0 template=walkthrough pagenames="""
walkthrough/creating_a_repository
- walkthrough/adding_a_remote
walkthrough/adding_files
+ walkthrough/adding_a_remote
walkthrough/renaming_files
walkthrough/getting_file_content
walkthrough/syncing
diff --git a/doc/walkthrough/creating_a_repository.mdwn b/doc/walkthrough/creating_a_repository.mdwn
index c5e389d33..b5b3ab407 100644
--- a/doc/walkthrough/creating_a_repository.mdwn
+++ b/doc/walkthrough/creating_a_repository.mdwn
@@ -4,4 +4,3 @@ This is very straightforward.
# cd ~/annex
# git init
# git annex init
- # git config receive.denyNonFastForwards false