From: krqt.kndy@eb44788e4eb202f3e68eeb8ba175d3897c3979a9 Date: Fri, 17 Feb 2017 21:15:00 +0000 (-0400) Subject: (no commit message) X-Git-Tag: debian/3.20170622~116^2 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/b92b8caf119f80b1cb13bbdcc1c98439e6338208 --- diff --git a/doc/tips/laptop_wiki_with_git/discussion.mdwn b/doc/tips/laptop_wiki_with_git/discussion.mdwn index b44285d5c..fd5409ea5 100644 --- a/doc/tips/laptop_wiki_with_git/discussion.mdwn +++ b/doc/tips/laptop_wiki_with_git/discussion.mdwn @@ -1,3 +1,8 @@ +I have tried `gitorigin_branch:` and it does not seem to work. I have to use `gitorigin_branch: ''` to literally set it to empty string to make it work. +[[newton108]] + +---- + I have followed this idea along, and it seems to work pretty well. Now I have a question as a git newbie. Can I have the post-commit hook on the server use something like rsync to update the files on a third machine hosting the web server? The web server does not have git (cretins!). Of course I could just run a cron job. @@ -11,6 +16,8 @@ Or, was this last remark about rebuilding after pulling meant to apply to rebuil > Of course you don't need a web server on the laptop. It is useful for > previewing pages before publishing them though. --[[Joey]] +---- + I have followed this idea too, however after pushing to the server running gitk in the scrdir shows that the remotes/origin/master branch is newer than the master. Is this normal? Have I reset the master branch to remotes/origin/master then every time when someone pushed something (and run ikiwiki -setup afterwards?) [[Micheal]]