Add missing NULL in blame_grep

[tig.git] / manual.txt

diff --git a/manual.txt b/manual.txt
index 87f949250f165211d9b3d97942e049286192578c..85775f3d1ab11fb50c45ae9fe7ad422e45cc1166 100644 (file)
--- a/manual.txt
+++ b/manual.txt
@@ -345,7 +345,28 @@ Up This key is "context sensitive" and will move the cursor one \
        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.
+       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]]
@@ -355,8 +376,8 @@ Cursor Navigation
 `-------`--------------------------------------------------------------------
 Key    Action
 -----------------------------------------------------------------------------
-j      Move cursor one line up.
-k      Move cursor one line down.
+k      Move cursor one line up.
+j      Move cursor one line down.
 PgUp,\
 -,a    Move cursor one page up.
 PgDown Space   Move cursor one page down.
@@ -375,6 +396,8 @@ Insert      Scroll view one line up.
 Delete Scroll view one line down.
 w      Scroll view one page up.
 s      Scroll view one page down.
+Left   Scroll view one column left.
+Right  Scroll view one column right.
 -----------------------------------------------------------------------------
 
 [[searching]]
@@ -384,10 +407,10 @@ Searching
 `-------`--------------------------------------------------------------------
 Key    Action
 -----------------------------------------------------------------------------
-/      Search the view. Opens a prompt for entering search regex to use.
-?      Search backwards in the view. Also prompts for regex.
-n      Find next match for the current search regex.
-N      Find previous match for the current search regex.
+/      Search the view. Opens a prompt for entering search regexp to use.
+?      Search backwards in the view. Also prompts for regexp.
+n      Find next match for the current search regexp.
+N      Find previous match for the current search regexp.
 -----------------------------------------------------------------------------
 
 [[misc-keys]]
@@ -410,17 +433,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.
 e      Open file in editor.
 -----------------------------------------------------------------------------
 
@@ -431,7 +443,7 @@ External Commands
 For more custom needs, external commands provide a way to easily execute
 a script or program. They are bound to keys and use information from the
 current browsing state, such as the current commit ID. Tig comes with
-the following builtin external commands:
+the following built-in external commands:
 
 `-------`--------------------------------------------------------------------
 Key    Action
@@ -588,4 +600,3 @@ Other git repository browsers:
 
  - gitk(1)
  - qgit(1)
- - gitview(1)