From: https://www.google.com/accounts/o8/id?id=AItOawkJHb27RVmw93kqyzfoxZWNKjqR8MEVt3A Date: Sat, 12 Nov 2011 16:02:00 +0000 (-0400) Subject: (no commit message) X-Git-Tag: 3.20111107~104 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/ad914e9e0ba9c5e9afef1e216025e60c0f8b93ea?hp=63effaf1944e487764e5d0d15119c0aa726e00b9 --- diff --git a/doc/rcs/git.mdwn b/doc/rcs/git.mdwn index c02c0216d..85fa862e0 100644 --- a/doc/rcs/git.mdwn +++ b/doc/rcs/git.mdwn @@ -114,7 +114,7 @@ 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 could use git's `post-merge` hook +-setup localwiki.setup -refresh`. You [[Du lich|http://didaudidau.vn]] could use git's `post-merge` hook to automate that command. -[[nha sach|http://nhasach.edu.vn]] +