Update documentation

... to list search option in tigrc and mention the stage view
in the manual.

diff --git a/manual.txt b/manual.txt
index 043b32a08a55fe96427caa4b7ff094a7a16adb7d..957fac4fb0c86e0f7a5904d229b4056836f5dde9 100644 (file)
--- 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.
 
        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.
 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
 f      Switch to (file) blob view.
 h      Switch to help view
 S      Switch to status view

+c      Switch to stage view

 -----------------------------------------------------------------------------
 
 [[view-manipulation]]
 -----------------------------------------------------------------------------
 
 [[view-manipulation]]


@@ -329,6 +334,11 @@ 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`
 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.

 -----------------------------------------------------------------------------
 
 [[refspec]]
 -----------------------------------------------------------------------------
 
 [[refspec]]


@@ -459,7 +469,7 @@ include::BUGS[]
 Copyright
 ---------
 
 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
 
 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

diff --git a/tig.1.txt b/tig.1.txt
index bb2784c9b96032b48a05f5df802884b79adc1dc1..13d4059c63eb1ebb27bf8698d1d7a6c7375444cd 100644 (file)
--- a/tig.1.txt
+++ b/tig.1.txt
@@ -120,7 +120,7 @@ include::BUGS[]
 
 COPYRIGHT
 ---------
 
 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
 
 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

diff --git a/tigrc.5.txt b/tigrc.5.txt
index d9047b3b53e0c80b0c0317c8381bda1e3f23503c..9d3ad6992f8afc9b2e21780418062e9e312e3121 100644 (file)
--- a/tigrc.5.txt
+++ b/tigrc.5.txt
@@ -123,8 +123,8 @@ built-in keybindings.
 
 Keymaps::
 
 
 Keymaps::
 

-Valid keymaps are: *main*, *diff*, *log*, *help*, *pager*, *status*, and
-*generic*.  Use *generic* to set key mapping in all keymaps.
+Valid keymaps are: *main*, *diff*, *log*, *help*, *pager*, *status*, *stage*,
+and *generic*.  Use *generic* to set key mapping in all keymaps.

 
 Key values::
 
 
 Key values::
 


@@ -160,6 +160,7 @@ view-log            Show log view
 view-tree              Show tree view
 view-blob              Show blob view
 view-status            Show status view
 view-tree              Show tree view
 view-blob              Show blob view
 view-status            Show status view

+view-stage             Show stage view

 view-pager             Show pager view
 view-help              Show help page
 ------------------------------------------------------------------------------
 view-pager             Show pager view
 view-help              Show help page
 ------------------------------------------------------------------------------


@@ -204,6 +205,18 @@ scroll-page-eup            Scroll one page up
 scroll-page-down       Scroll one page down
 ------------------------------------------------------------------------------
 
 scroll-page-down       Scroll one page down
 ------------------------------------------------------------------------------
 

+ifdef::backend-xhtml11[]
+[frame="none"]
+`-----------------------`-----------------------------------------------------
+endif::backend-xhtml11[]
+Searching:
+------------------------------------------------------------------------------
+search                 Search the view
+search-back            Search backwards in the view
+find-next              Find next search match
+find-prev              Find previous search match
+------------------------------------------------------------------------------
+

 ifdef::backend-xhtml11[]
 [frame="none"]
 `-----------------------`-----------------------------------------------------
 ifdef::backend-xhtml11[]
 [frame="none"]
 `-----------------------`-----------------------------------------------------


@@ -219,6 +232,7 @@ stop-loading                Stop all loading views
 toggle-lineno          Toggle line numbers
 toggle-rev-graph       Toggle revision graph visualization
 status-update          Update file status
 toggle-lineno          Toggle line numbers
 toggle-rev-graph       Toggle revision graph visualization
 status-update          Update file status

+edit                   Open in editor

 ------------------------------------------------------------------------------
 
 
 ------------------------------------------------------------------------------
 
 


@@ -348,7 +362,7 @@ For now only `Signed-off-by` and `Acked-by` lines are colorized.
 
 COPYRIGHT
 ---------
 
 COPYRIGHT
 ---------

-Copyright (c) 2006 Jonas Fonseca <fonseca@diku.dk>
+Copyright (c) 2006-2007 Jonas Fonseca <fonseca@diku.dk>

 
 Licensed under the terms of the GNU General Public License.
 
 
 Licensed under the terms of the GNU General Public License.