From d426d85854e0d3a12b0af51ba487d7aaeada811a Mon Sep 17 00:00:00 2001 From: Jonas Fonseca Date: Sat, 24 Jan 2009 12:51:38 +0100 Subject: [PATCH] tigrc(5) & manual: move view specific actions out of the misc group --- manual.txt | 31 ++++++++++++++++++++----------- tigrc.5.txt | 16 ++++++++++++---- 2 files changed, 32 insertions(+), 15 deletions(-) diff --git a/manual.txt b/manual.txt index fe4d311..7df9846 100644 --- a/manual.txt +++ b/manual.txt @@ -349,6 +349,26 @@ Down Similar to 'Up' but will move down. commit. For merges the parent is queried. ----------------------------------------------------------------------------- +[[view-manipulation]] +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 ). 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]] Cursor Navigation ~~~~~~~~~~~~~~~~~ @@ -411,17 +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 ). 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. ----------------------------------------------------------------------------- diff --git a/tigrc.5.txt b/tigrc.5.txt index 3da0d2f..0090ca7 100644 --- a/tigrc.5.txt +++ b/tigrc.5.txt @@ -228,6 +228,17 @@ view-close Close the current view quit Close all views and quit ------------------------------------------------------------------------------ +ifdef::backend-xhtml11[] +[frame="none"] +`-----------------------`----------------------------------------------------- +endif::backend-xhtml11[] +View specific actions: +------------------------------------------------------------------------------ +status-update Update file status +status-merge Resolve unmerged file +stage-next Find next chunk to stage +------------------------------------------------------------------------------ + ifdef::backend-xhtml11[] [frame="none"] `-----------------------`----------------------------------------------------- @@ -272,7 +283,6 @@ ifdef::backend-xhtml11[] endif::backend-xhtml11[] Misc: ------------------------------------------------------------------------------ -none Do nothing prompt Bring up the prompt screen-redraw Redraw the screen screen-resize Resize the screen @@ -283,10 +293,8 @@ toggle-date Toggle date display toggle-author Toggle author display toggle-rev-graph Toggle revision graph visualization toggle-refs Toggle reference display -status-update Update file status -status-merge Resolve unmerged file -stage-next Find next chunk to stage edit Open in editor +none Do nothing ------------------------------------------------------------------------------ -- 2.30.2