diff options
| author | https://www.google.com/accounts/o8/id?id=AItOawk_MMtLPS7osC5MjX00q2ATjvvXPWqm0ik <micheal@web> | 2011-12-10 16:14:06 -0400 |
|---|---|---|
| committer | admin <admin@branchable.com> | 2011-12-10 16:14:06 -0400 |
| commit | ed8df876a97d5a912844a36bd39ea005241e5feb (patch) | |
| tree | 5ac71fded2576ef94290b364ee99d8c56a4c12a0 /doc/tips | |
| parent | a545009b63bdfd75cfa2c23f9cab3d9694c2e074 (diff) | |
| download | ikiwiki-ed8df876a97d5a912844a36bd39ea005241e5feb.tar ikiwiki-ed8df876a97d5a912844a36bd39ea005241e5feb.tar.gz | |
Diffstat (limited to 'doc/tips')
| -rw-r--r-- | doc/tips/laptop_wiki_with_git/discussion.mdwn | 3 |
1 files changed, 3 insertions, 0 deletions
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]] |