X-Git-Url: https://git.distorted.org.uk/~mdw/tig/blobdiff_plain/173d76ea34a54342687c3d03ed71930429dca299..b5c18d9d6f568c0779d3f5d7e12eb3dffe3603da:/manual.txt

diff --git a/manual.txt b/manual.txt
index 043b32a..b976ece 100644
--- a/manual.txt
+++ b/manual.txt
@@ -199,6 +199,10 @@ The status view::
 	Displays status of files in the working tree and allows changes to be
 	staged/unstaged as well as adding of untracked files.
 
+The stage view::
+	Displays diff changes for staged or unstanged files being tracked or
+	file content of untracked files.
+
 The pager view::
 	Is used for displaying both input from stdin and output from git
 	commands entered in the internal prompt.
@@ -245,6 +249,7 @@ t	Switch to (directory) tree view.
 f	Switch to (file) blob view.
 h	Switch to help view
 S	Switch to status view
+c	Switch to stage view
 -----------------------------------------------------------------------------
 
 [[view-manipulation]]
@@ -262,6 +267,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 \
@@ -329,6 +335,14 @@ v	Show version.
 g	Toggle revision graph visualization on/off.
 ':'	Open prompt. This allows you to specify what git command \
 	to run. Example `:log -p`
+u	Update status of file. In the status view, this allows you to add an \
+	untracked file or stage changes to a file for next commit (similar to \
+	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).
 -----------------------------------------------------------------------------
 
 [[refspec]]
@@ -459,7 +473,7 @@ include::BUGS[]
 Copyright
 ---------
 
-Copyright (c) 2006 Jonas Fonseca <fonseca@diku.dk>
+Copyright (c) 2006-2007 Jonas Fonseca <fonseca@diku.dk>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by