Merge with master

diff --git a/INSTALL b/INSTALL
index dac48a4e184ab08be2258a5ec99aca896d9f589f..088f6742c41683e63daa04417a66048d5bd340e4 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -14,6 +14,11 @@ To install documentation run:
 
        $ make install-docs
 
+Edit the Makefile if you need to configure specific compiler or linker flags.
+On FreeBSD for example the c library does not support the iconv interface and
+to compile tig you need to append `-L/usr/local/lib -liconv` to `LDLIBS` and
+`-I/usr/local/include` to the `CFLAGS` variable.
+
 The following tools and packages are needed:
 
 `-------------------------------`----------------------------------------------
@@ -23,5 +28,8 @@ git-core                      Tig is just a frontend for git.
 ncurses                                Be sure to also have development files \
                                installed. Usually they are available in a \
                                separate package ending with `-dev`.
+iconv                          If iconv is not provided by the c library \
+                               you need to change the Makefile to link it \
+                               into the binary.
 asciidoc (>= 7.0), xmlto       For building documentation. (Optional)
 -------------------------------------------------------------------------------

diff --git a/SITES b/SITES
index 25e94dc757390bd7c4882cbd396d7c3cf3776999..500b9770772df2b5e8fccf28746176044f12c192 100644 (file)
--- a/SITES
+++ b/SITES
@@ -1,5 +1,6 @@
- - Homepage: http://jonas.nitro.dk/tig[]
- - Manual: http://jonas.nitro.dk/tig/manual.html[]
- - Releases: http://jonas.nitro.dk/tig/releases[]
- - Git URL:  http://jonas.nitro.dk/tig/tig.git[]
- - Gitweb: http://pasky.or.cz/gitweb.cgi?p=tig.git;a=summary[]
+ - Homepage:   http://jonas.nitro.dk/tig[]
+ - Manual:     http://jonas.nitro.dk/tig/manual.html[]
+ - Releases:   http://jonas.nitro.dk/tig/releases[]
+ - Git URL:    http://jonas.nitro.dk/tig/tig.git[] or
+               git://repo.or.cz/tig.git
+ - Gitweb:     http://repo.or.cz/?p=tig.git;a=summary[]

diff --git a/manual.txt b/manual.txt
index cf7b83fec0ac850d2dd23fdac9fc4d8692ba64f5..2a12b99418a83b92bcf3fd4e3717a2bf58cb9c4a 100644 (file)
--- a/manual.txt
+++ b/manual.txt
@@ -120,6 +120,19 @@ TIG_MAIN_CMD::
        the option: `--pretty=raw` since the main view parser expects to
        read that format.
 
+[[tree-commands]]
+Tree Commands
+~~~~~~~~~~~~~
+
+TIG_TREE_CMD::
+       The command used for the tree view. Takes two arguments, the first
+       is the revision ID and the second is the path of the directory tree,
+       empty for the root directory. Defaults to "git ls-tree %s %s".
+
+TIG_BLOB_CMD::
+       The command used for the blob view. Takes one argument which is
+       the blob ID. Defaults to "git cat-file blob %s".
+
 [[viewer]]
 The Viewer
 ----------