remove recent addition of receive.denyNonFastForwards to walkthrough
authorJoey Hess <joeyh@joeyh.name>
Mon, 13 Feb 2017 20:02:53 +0000 (16:02 -0400)
committerJoey Hess <joeyh@joeyh.name>
Mon, 13 Feb 2017 20:02:53 +0000 (16:02 -0400)
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.

doc/walkthrough.mdwn
doc/walkthrough/creating_a_repository.mdwn

index b35cf808d8add0f71a911d1d7a9189ebd28b1fca..4745ca117210aa295d977482cb04b20749cdd171 100644 (file)
@@ -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
index c5e389d336e9bd393ebf15973793c05148fe7e9a..b5b3ab407831ade3cb8c1ac318b12f402241c44c 100644 (file)
@@ -4,4 +4,3 @@ This is very straightforward.
        # cd ~/annex
        # git init
        # git annex init
-       # git config receive.denyNonFastForwards false