reorg all the git cruft a bit, highlight setup page and de-highlight more

[ikiwiki.git] / doc / rcs / git.mdwn

diff --git a/doc/rcs/git.mdwn b/doc/rcs/git.mdwn
index d77fffeb8a26d15c9b9e98dfe50b8f03e1e7db74..55e2f1d556e06c3923c74fe1f3b5e5a5a3506223 100644 (file)
--- a/doc/rcs/git.mdwn
+++ b/doc/rcs/git.mdwn
@@ -1,17 +1,17 @@
 [[meta title="Git"]]
 
 [[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
 
 [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]]