X-Git-Url: https://git.distorted.org.uk/~mdw/tig/blobdiff_plain/f9a044a436b05abfb853002b8d237b326dd8deb3..b6607e7e796f5b58d64211c022d3e1af6159bdaa:/manual.txt

diff --git a/manual.txt b/manual.txt
index 957fac4..efdb079 100644
--- a/manual.txt
+++ b/manual.txt
@@ -65,6 +65,21 @@ Environment Variables
 Several options related to the interface with git can be configured via
 environment options.
 
+[[configuration-files]]
+Configuration Files
+~~~~~~~~~~~~~~~~~~~
+
+Upon startup, tig first reads the system wide configuration file
+(`{sysconfdir}/tigrc` by default) and then proceeds to read the user's
+configuration file (`~/.tigrc` by default). The paths to either of these files
+can be overridden through the following environment variables:
+
+TIGRC_USER::
+	Path of the user configuration file.
+
+TIGRC_SYSTEM::
+	Path of the system wide configuration file.
+
 [[repo-refs]]
 Repository References
 ~~~~~~~~~~~~~~~~~~~~~
@@ -267,6 +282,7 @@ Enter	This key is "context sensitive" depending on what view you are \
 	view, split the view and show the commit diff. In the diff view \
 	pressing Enter will simply scroll the view one line down.
 Tab	Switch to next view.
+R	Reload and refresh the current view.
 Up	This key is "context sensitive" and will move the cursor one \
 	line up. However, if you opened a diff view from the main view \
 	(split- or full-screen) it will change the cursor to point to \
@@ -339,6 +355,26 @@ u	Update status of file. In the status view, this allows you to add an \
 	running git-add <filename>). In the stage view, when pressing this on \
 	a diff chunk line stages only that chunk for next commit, when not on \
 	a diff chunk line all changes in the displayed diff is staged.
+M	Resolve unmerged file by launching git-mergetool(1). Note, to work \
+	correctly this might require some initial configuration of your \
+	preferred merge tool. See the manpage of git-mergetool(1).
+','	Move tree view to the parent tree.
+e	Open file in editor.
+-----------------------------------------------------------------------------
+
+[[external-commands]]
+External Commands
+~~~~~~~~~~~~~~~~~
+
+Tig also comes with a few builtin external commands. These are simple shell
+commands that are run and can take arguments from the current browsing state,
+such as the current commit ID. The default commands are:
+
+`-------`--------------------------------------------------------------------
+Key	Action
+-----------------------------------------------------------------------------
+C	git cherry-pick %(commit)
+G	git gc
 -----------------------------------------------------------------------------
 
 [[refspec]]
@@ -489,11 +525,6 @@ Online resources:
 
 include::SITES[]
 
-Git porcelains:
-
- - link:http://www.kernel.org/pub/software/scm/git/docs/[git],
- - link:http://www.kernel.org/pub/software/scm/cogito/docs/[Cogito]
-
 Other git repository browsers:
 
  - gitk(1)