From f9a044a436b05abfb853002b8d237b326dd8deb3 Mon Sep 17 00:00:00 2001 From: Jonas Fonseca Date: Thu, 13 Sep 2007 11:06:36 +0200 Subject: [PATCH] Update documentation ... to list search option in tigrc and mention the stage view in the manual. --- manual.txt | 12 +++++++++++- tig.1.txt | 2 +- tigrc.5.txt | 20 +++++++++++++++++--- 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/manual.txt b/manual.txt index 043b32a..957fac4 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]] @@ -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` +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 ). 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]] @@ -459,7 +469,7 @@ include::BUGS[] Copyright --------- -Copyright (c) 2006 Jonas Fonseca +Copyright (c) 2006-2007 Jonas Fonseca 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 bb2784c..13d4059 100644 --- a/tig.1.txt +++ b/tig.1.txt @@ -120,7 +120,7 @@ include::BUGS[] COPYRIGHT --------- -Copyright (c) 2006 Jonas Fonseca +Copyright (c) 2006-2007 Jonas Fonseca 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 d9047b3..9d3ad69 100644 --- a/tigrc.5.txt +++ b/tigrc.5.txt @@ -123,8 +123,8 @@ built-in keybindings. 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:: @@ -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-stage Show stage view 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 ------------------------------------------------------------------------------ +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"] `-----------------------`----------------------------------------------------- @@ -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 +edit Open in editor ------------------------------------------------------------------------------ @@ -348,7 +362,7 @@ For now only `Signed-off-by` and `Acked-by` lines are colorized. COPYRIGHT --------- -Copyright (c) 2006 Jonas Fonseca +Copyright (c) 2006-2007 Jonas Fonseca Licensed under the terms of the GNU General Public License. -- 2.32.0.93.g670b81a890