diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2009-10-21 13:51:01 -0400 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2009-10-21 13:51:01 -0400 |
| commit | ba682e0f9a55ffd74584aa3b8abb0087c7762317 (patch) | |
| tree | 753babaf34341acb80e6a4a5c181aac2593ea9e9 | |
| parent | 587e0c3d21dfbde052e0fd71a7ed0e33e09e757f (diff) | |
| parent | b69f9eba9250b5c71e81415c977836d4421ef0a4 (diff) | |
| download | ikiwiki-ba682e0f9a55ffd74584aa3b8abb0087c7762317.tar ikiwiki-ba682e0f9a55ffd74584aa3b8abb0087c7762317.tar.gz | |
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
| -rw-r--r-- | doc/forum/Cannot_write_to_commitlock.mdwn | 17 | ||||
| -rw-r--r-- | doc/forum/cleaning_up_discussion_pages_and_the_like.mdwn | 2 | ||||
| -rw-r--r-- | doc/ikiwikiusers.mdwn | 1 |
3 files changed, 18 insertions, 2 deletions
diff --git a/doc/forum/Cannot_write_to_commitlock.mdwn b/doc/forum/Cannot_write_to_commitlock.mdwn new file mode 100644 index 000000000..a5d4bf440 --- /dev/null +++ b/doc/forum/Cannot_write_to_commitlock.mdwn @@ -0,0 +1,17 @@ +I am following the laptop wiki with git tip page. I have set up my local and remote wiki as suggested. However, when I try to push my local changes back to the server I get the following error: + +Writing objects: 100% (4/4), 359 bytes, done. +Total 4 (delta 2), reused 0 (delta 0) +cannot write to /home/ian/ianbarton/.ikiwiki/commitlock: No such file or directory +To ian@wilkesley.org:~/ikiwiki/ianbarton.git + 5cf9054..16a871d master -> master + +The relevnt bit of my setup file is: + +git_wrapper => '/home/ian/ianbarton.git/hooks/post-commit', + +Now ~/ianbarton/.ikiwiki exists and is owned and writable by me. I have tried touching commitlock and also removing lock and commitlock before pushing. Any suggestions for further trouble shooting? + +Ian. + + diff --git a/doc/forum/cleaning_up_discussion_pages_and_the_like.mdwn b/doc/forum/cleaning_up_discussion_pages_and_the_like.mdwn index 0c9619647..35ceae59b 100644 --- a/doc/forum/cleaning_up_discussion_pages_and_the_like.mdwn +++ b/doc/forum/cleaning_up_discussion_pages_and_the_like.mdwn @@ -9,5 +9,3 @@ That's also what I think: such discussions or comments on [[forum]] discussion pages, or generally on all pages' [[Discussion]] subpages, can be removed if either they're simply not valid / interesting / ... anymore, or if they've been used to improve the *real* documentation. --[[tschwinge]] - -test diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index a98abf578..f6ab34653 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -127,6 +127,7 @@ Personal sites and blogs * [Skirv's Wiki](http://wiki.killfile.org) - formerly Skirv's Homepage * [Jimmy Tang - personal blog and wiki](http://www.sgenomics.org/~jtang) * [Weakish Jiang's Homepage](http://weakish.pigro.net) +* [Nico Schottelius' homepage](http://www.nico.schottelius.org) Please feel free to add your own ikiwiki site! |