summaryrefslogtreecommitdiff
path: root/doc/rcs/git.mdwn
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-10-21 00:57:10 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-10-21 00:57:10 +0000
commitf91ebfa01bf9858096eb2bb07805b3949171d959 (patch)
tree07e762a454f1413147ac399a87ae11a4522f0b91 /doc/rcs/git.mdwn
parent9a060e6c6eb16942588ab261ac39c049ff6bfe1e (diff)
reorg all the git cruft a bit, highlight setup page and de-highlight more
complex or less perfect setup methods
Diffstat (limited to 'doc/rcs/git.mdwn')
-rw-r--r--doc/rcs/git.mdwn16
1 files changed, 8 insertions, 8 deletions
diff --git a/doc/rcs/git.mdwn b/doc/rcs/git.mdwn
index d77fffeb8..55e2f1d55 100644
--- a/doc/rcs/git.mdwn
+++ b/doc/rcs/git.mdwn
@@ -1,17 +1,17 @@
[[meta title="Git"]]
-[Git][git] is a distributed revison control system originally developed for the Linux kernel. Ikiwiki supports storing a wiki in git.
+[Git][git] is a distributed revison control system originally developed for
+the Linux kernel. Ikiwiki supports storing a wiki in git.
[git]: http://git.or.cz/
Ikiwiki can run as a post-update hook to update a wiki whenever commits
come in. When running as a [[cgi]] with Git, ikiwiki automatically
-commits edited pages, and uses the Git history to generate the [[RecentChanges]] page.
+commits edited pages, and uses the Git history to generate the
+[[RecentChanges]] page.
-Links:
+[[Setup]] documents current best practice for using git with ikiwiki. This
+involves setting up a pair of git repositories. This method isn't the most
+obvious, but it works the best.
-* [[Editing_wiki_pages_manually_with_git|GitManual]]
-* [HOWTO: ikiwiki + git][howto]
-* Common [[Git_pitfalls|/setup/git_pitfalls]] when using Git with Ikiwiki
-
-[howto]: http://fob.po8.org/node/346
+See also: [[common_git_pitfalls|/setup/git_pitfalls]]