From 748ecc51d80515433436d8f8f06972a9496e7d36 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 13 Feb 2017 16:02:53 -0400 Subject: [PATCH] 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. --- doc/walkthrough.mdwn | 2 +- doc/walkthrough/creating_a_repository.mdwn | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/walkthrough.mdwn b/doc/walkthrough.mdwn index b35cf808d8..4745ca1172 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 c5e389d336..b5b3ab4078 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