Document rev-list's option --merge

[git.git] / Documentation / git.txt

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 7310a2b8b8bc474f53d498d254cab772a8ef45ae..bcf187a11cfaf754ecb93a2210139dd88f6a9d32 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -397,6 +397,9 @@ gitlink:git-quiltimport[1]::
 gitlink:git-relink[1]::
        Hardlink common objects in local repositories.
 
+gitlink:git-svn[1]::
+       Bidirectional operation between a single Subversion branch and git.
+
 gitlink:git-svnimport[1]::
        Import a SVN repository into git.
 
@@ -442,6 +445,9 @@ gitlink:git-get-tar-commit-id[1]::
 gitlink:git-imap-send[1]::
        Dump a mailbox from stdin into an imap folder.
 
+gitlink:git-instaweb[1]::
+       Instantly browse your working repository in gitweb.
+
 gitlink:git-mailinfo[1]::
        Extracts patch and authorship information from a single
        e-mail message, optionally transliterating the commit