aboutsummaryrefslogtreecommitdiff
path: root/doc/rcs
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2011-11-12 12:17:09 -0400
committerJoey Hess <joey@kitenet.net>2011-11-12 12:17:09 -0400
commitf0cbd662fdb615a4b5c0715c06bc375f9d81f4ad (patch)
tree95ede065a72dabe173047a777e17534928c02520 /doc/rcs
parent438b72407566b0c95f904f98ea5db2804b8be8ec (diff)
downloadikiwiki-f0cbd662fdb615a4b5c0715c06bc375f9d81f4ad.tar
ikiwiki-f0cbd662fdb615a4b5c0715c06bc375f9d81f4ad.tar.gz
Revert multiple spams
Diffstat (limited to 'doc/rcs')
-rw-r--r--doc/rcs/git.mdwn4
1 files changed, 1 insertions, 3 deletions
diff --git a/doc/rcs/git.mdwn b/doc/rcs/git.mdwn
index 85fa862e0..b4f639c61 100644
--- a/doc/rcs/git.mdwn
+++ b/doc/rcs/git.mdwn
@@ -114,7 +114,5 @@ the first time you run setup.) Use standard git commands to handle
pulling from and pushing to the server. **Note**: After
pulling changes from the bare root repository, you will need to
manually update the local wiki, with a command such as `ikiwiki
--setup localwiki.setup -refresh`. You [[Du lich|http://didaudidau.vn]] could use git's `post-merge` hook
+-setup localwiki.setup -refresh`. You could use git's `post-merge` hook
to automate that command.
-
-