projects
/
ikiwiki.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
122f6df
)
prefix-directives branch is merged so no need to list anymore
author
Joey Hess
<joey@kodama.kitenet.net>
Sun, 10 Feb 2008 07:11:05 +0000
(
02:11
-0500)
committer
Joey Hess
<joey@kodama.kitenet.net>
Sun, 10 Feb 2008 07:11:05 +0000
(
02:11
-0500)
doc/git.mdwn
patch
|
blob
|
history
diff --git
a/doc/git.mdwn
b/doc/git.mdwn
index 6cbc1e489a491953753c9ea985fcb4da033de676..8005dcf6ec5a4a03ae0a04cd740afa49b19d65ce 100644
(file)
--- a/
doc/git.mdwn
+++ b/
doc/git.mdwn
@@
-25,10
+25,6
@@
Some of the branches included in the main repository include:
work with the current *master* branch again.
* `html` is an unfinished attempt at making ikiwiki output HTML 4.01
instead of xhtml.
-
-* `prefix-directives` changes the preprocessor directive syntax.
- Passes all test cases; pending merge.
-
* `wikiwyg` adds [[todo/wikiwyg]] support. It is unmerged pending some
changes.
* `pristine-tar` contains deltas that