diff options
author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-10-21 01:39:18 +0000 |
---|---|---|
committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-10-21 01:39:18 +0000 |
commit | 3f7944fdc784eaf73c683bb521a3c5adfde74295 (patch) | |
tree | bb7ad3385d1fbb08bfde08bc746a9028b9b4e404 /doc | |
parent | e9ac4b1fc5c2b056ee9ff902e978b35da1181bfa (diff) | |
download | ikiwiki-3f7944fdc784eaf73c683bb521a3c5adfde74295.tar ikiwiki-3f7944fdc784eaf73c683bb521a3c5adfde74295.tar.gz |
document exactly what goes on during a cgi edit or remote commit with git
Diffstat (limited to 'doc')
-rw-r--r-- | doc/rcs/details.mdwn | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/doc/rcs/details.mdwn b/doc/rcs/details.mdwn index 3c9e465c2..e09fcf758 100644 --- a/doc/rcs/details.mdwn +++ b/doc/rcs/details.mdwn @@ -150,6 +150,21 @@ Note that, as a rule of thumb, you should always put the rcs wrapper (`post-upda into the master repository (`.git/hooks/`) as can be noticed in the Git wrappers of the sample [[ikiwiki.setup]]. +Here is how a web edit works with ikiwiki and git: + +* ikiwiki cgi modifies the page source in the clone +* git-commit in the clone +* git push origin master, pushes the commit from the clone to the master repo +* the master repo's post-update hook notices this update, and runs ikiwiki +* ikiwiki notices the modifies page source, and compiles it + +Here is a how a commit from a remote repository works: + +* git-commit in the remote repository +* git-push, pushes the commit to the master repo on the server +* the master repo's post-update hook notices this update, and runs ikiwiki +* ikiwiki notices the modifies page source, and compiles it + ## [[Mercurial]] The Mercurial backend is still in a early phase, so it may not be mature |