summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2003-08-27 00:00:24 +0000
committerLennart Poettering <lennart@poettering.net>2003-08-27 00:00:24 +0000
commit7ea422bfaf6c9d22346cd415fd6b97712322fd81 (patch)
tree6dd1c236da1d3d078f2801d94ac12fc4a51a4de0
parenta363358fcd5cb206c188835f78b9d535ec48f303 (diff)
documentation update
git-svn-id: file:///home/lennart/svn/public/syrep/trunk@8 07ea20a6-d2c5-0310-9e02-9ef735347d72
-rw-r--r--doc/usage-intro.txt27
1 files changed, 17 insertions, 10 deletions
diff --git a/doc/usage-intro.txt b/doc/usage-intro.txt
index aebc64d..2cf2096 100644
--- a/doc/usage-intro.txt
+++ b/doc/usage-intro.txt
@@ -1,20 +1,27 @@
-diff [DIR|SNAP] [DIR|SNAP]
+Complete:
-update [-S SNAP] DIR
+ diff [DIR|SNAP] [DIR|SNAP]
-list [DIR|SNAP]
+ update [-S SNAP] DIR
-info [DIR|SNAP]
+ list [DIR|SNAP]
-history [DIR|SNAP]
+ info [DIR|SNAP]
-extract [-o DIR] PATCH
+ history [DIR|SNAP]
-merge [-S SNAP] SNAP DIR
-merge [-S SNAP] PATCH DIR
+ extract [-o DIR] PATCH
-makepatch [-S SNAP] -O PATCH SNAP DIR
-makepatch [-S SNAP] SNAP DIR > PATCH
+Partially:
+ merge [-S SNAP] SNAP DIR
+Not yet:
+ merge [-S SNAP] PATCH DIR
+ merge [-S SNAP] DIR DIR
+ merge [-S SNAP] URL://DIR DIR
+ makepatch [-S SNAP] -O PATCH SNAP DIR
+ makepatch [-S SNAP] SNAP DIR > PATCH
+
+$Id$