BUGS: document problem with scrolling in (u)xterm

[tig.git] / manual.txt

diff --git a/manual.txt b/manual.txt
index 5a295e07154738e4eb49dd20a9af13f20a0481a9..2969c1371f627dc150bd2ae3a8774a4ab6abd3f2 100644 (file)
--- a/manual.txt
+++ b/manual.txt
@@ -344,6 +344,29 @@ Up This key is "context sensitive" and will move the cursor one \
        the previous commit in the main view and update the diff view \
        to display it.
 Down   Similar to 'Up' but will move down.
+','    Move to parent. In the tree view, this means switch to the parent \
+       directory. In the blame view it will load blame for the parent \
+       commit. For merges the parent is queried.
+-----------------------------------------------------------------------------
+
+[[view-actions]]
+View Specific Actions
+~~~~~~~~~~~~~~~~~~~~~
+
+`-------`--------------------------------------------------------------------
+Key    Action
+-----------------------------------------------------------------------------
+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).
+!      Checkout file with unstaged changes. This will reset the file to \
+       contain the content it had at last commit.
+@      Move to next chunk in the stage view.
 -----------------------------------------------------------------------------
 
 [[cursor-nav]]
@@ -408,18 +431,6 @@ g  Toggle revision graph visualization on/off.
 F      Toggle reference display on/off (tag and branch names).
 ':'    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).
-!      Checkout file with unstaged changes. This will reset the file to \
-       contain the content it had at last commit.
-@      Move to next chunk in the stage view.
-','    Move tree view to the parent tree.
 e      Open file in editor.
 -----------------------------------------------------------------------------
 
@@ -563,7 +574,7 @@ include::BUGS[]
 Copyright
 ---------
 
-Copyright (c) 2006-2008 Jonas Fonseca <fonseca@diku.dk>
+Copyright (c) 2006-2009 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