X-Git-Url: https://git.distorted.org.uk/~mdw/tig/blobdiff_plain/272818eafff98333c51f1b614704160f265405ed..4ef1bf121de1697c9d54e10addcd34a4d19d3526:/manual.txt

diff --git a/manual.txt b/manual.txt
index a199ad1..1bafd1b 100644
--- a/manual.txt
+++ b/manual.txt
@@ -340,6 +340,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]]
@@ -490,11 +510,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)