Merge branch 'gitignore-none'

[code/vcsh.git] / doc / vcsh.1.ronn

diff --git a/doc/vcsh.1.ronn b/doc/vcsh.1.ronn
index 08e8c04a08df4964e64a224714c47f9e02d815ee..79a4063ebad86d1a0391afb471680a713bcd905b 100644 (file)
--- a/doc/vcsh.1.ronn
+++ b/doc/vcsh.1.ronn
@@ -21,6 +21,10 @@ vcsh(1) - Version Control System for $HOME - multiple Git repositories in $HOME
 
 `vcsh` list-tracked-by <repo>
 
+`vcsh` pull
+
+`vcsh` push
+
 `vcsh` rename <repo> <newname>
 
 `vcsh` run <repo> <shell command>
@@ -98,6 +102,12 @@ an interactive user.
 * list-tracked-by:
   List files tracked by a repository.
 
+* pull:
+  Pull from all vcsh remotes.
+
+* push:
+  Push to all vcsh remotes.
+
 * rename:
   Rename a repository.
 
@@ -151,14 +161,16 @@ executed in the context of your shell.
 Interesting knobs you can turn:
 
 * <$VCSH_GITIGNORE>:
-  Can be either <exact> or <recursive>.
+  Can be <exact>, <recursive>, or <none>.
 
-  <exact> will seed the repo-specific <.gitignore> with all file and directory
+  <exact> will seed the repo-specific ignore file with all file and directory
   names which `git ls-files` returns.
 
   <recursive> will descend through all directories recursively additionally to
   the above.
 
+  <none> will not write any ignore file.
+
   Defaults to <exact>.
 
 Less interesting knobs you could turn:
@@ -259,7 +271,7 @@ This manpage and `vcsh` itself were written by Richard "RichiH" Hartmann.
 
 ## COPYRIGHT
 
-Copyright 2011-2012 Richard Hartmann <richih.mailinglist@gmail.com>
+Copyright 2011-2013 Richard Hartmann <richih.mailinglist@gmail.com>
 
 Licensed under the GNU GPL version 2 or higher.