diff options
| author | Simon McVittie <smcv@debian.org> | 2012-03-18 15:31:41 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@debian.org> | 2012-03-18 15:31:41 +0000 |
| commit | 4e54fa1144065b7ff99e88e6c61ff1fdcf6175c9 (patch) | |
| tree | 6759b80b8722ea532385c9a3ccc74897b784967d /doc/tips/laptop_wiki_with_git/discussion.mdwn | |
| parent | d70ba7cff3fc6cc78ea2f8eb0713212478ab6ba7 (diff) | |
| parent | 0a9bb3edc2a9819ba87de1b6e57155120b6aba44 (diff) | |
| download | ikiwiki-4e54fa1144065b7ff99e88e6c61ff1fdcf6175c9.tar ikiwiki-4e54fa1144065b7ff99e88e6c61ff1fdcf6175c9.tar.gz | |
Merge tag '3.20120202' into trail3-integrated
Diffstat (limited to 'doc/tips/laptop_wiki_with_git/discussion.mdwn')
| -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]] |