diff options
| author | Joey Hess <joey@kitenet.net> | 2010-04-20 18:19:00 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-04-20 18:19:00 -0400 |
| commit | 34e8c78c1c9bf65564c1a3086584158e5c3cc415 (patch) | |
| tree | ba95100ac77e203def8c1529a9c128e85b8a7818 /doc/rcs.mdwn | |
| parent | 59ceeb5621ae0ae2bcb7501c6ac0c7a06562a7cc (diff) | |
| parent | 64946f91982d85bb301cc9241459939c657d0eb9 (diff) | |
| download | ikiwiki-34e8c78c1c9bf65564c1a3086584158e5c3cc415.tar ikiwiki-34e8c78c1c9bf65564c1a3086584158e5c3cc415.tar.gz | |
Merge branch 'master' into autotag
Diffstat (limited to 'doc/rcs.mdwn')
| -rw-r--r-- | doc/rcs.mdwn | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/doc/rcs.mdwn b/doc/rcs.mdwn index 450d16800..248d93024 100644 --- a/doc/rcs.mdwn +++ b/doc/rcs.mdwn @@ -6,8 +6,7 @@ histories. Ikiwiki started out supporting only [[Subversion|svn]], but the interface ikiwiki uses to a revision control system is sufficiently simple and generic that it can be adapted to work with many systems by writing a -[[plugin|plugins/write]]. [[Subversion|svn]] is still a recommended choice; -[[git]] is another well-tested option. +[[plugin|plugins/write]]. These days, most people use [[git]]. While all supported revision control systems work well enough for basic use, some advanced or special features are not supported in all of them. @@ -28,7 +27,7 @@ auto.setup |yes |yes |incomplete|yes |incomplete |yes `rcs_remove` |yes |yes |yes |yes |no |yes |no |yes `rcs_diff` |yes |yes |yes |yes |no |yes |yes |yes `rcs_getctime` |fast |slow |slow |slow |slow |slow |slow |slow -`rcs_getmtime` |fast |slow |no |no |no |no |no |no +`rcs_getmtime` |fast |slow |slow |no |no |no |no |no anonymous push |yes |no |no |no |no |no |no |no conflict handling |yes |yes |yes |buggy |yes |yes |yes |yes """]] |