From: https://www.google.com/accounts/o8/id?id=AItOawk_MMtLPS7osC5MjX00q2ATjvvXPWqm0ik Date: Sat, 10 Dec 2011 20:14:06 +0000 (-0400) Subject: (no commit message) X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ed8df876a97d5a912844a36bd39ea005241e5feb;p=ikiwiki.git --- diff --git a/doc/tips/laptop_wiki_with_git/discussion.mdwn b/doc/tips/laptop_wiki_with_git/discussion.mdwn index 6ce72ae7b..297a2a6a7 100644 --- a/doc/tips/laptop_wiki_with_git/discussion.mdwn +++ b/doc/tips/laptop_wiki_with_git/discussion.mdwn @@ -10,3 +10,6 @@ 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]]