From: Jonas Fonseca <fonseca@diku.dk>
Date: Sun, 24 Sep 2006 23:13:51 +0000 (+0200)
Subject: Merge with master
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/tig/commitdiff_plain/b799b7d277f85f1dd2b2c998b6d0c63c40b0d9ea?hp=af4c75a274ce4a06f0bc069dc94820a4b700e8bc

Merge with master
---

diff --git a/INSTALL b/INSTALL
index dac48a4..088f674 100644
--- 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 25e94dc..500b977 100644
--- 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 cf7b83f..2a12b99 100644
--- 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
 ----------