X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=manual.txt;h=2969c1371f627dc150bd2ae3a8774a4ab6abd3f2;hb=216b5a3395f265669e8424d0d836bb391925f5f3;hp=fe4d311be4c5f0a30de3199ed7d1825325101ef3;hpb=a2cebdb88437086d5083c893e472275e1cdf1957;p=tig.git diff --git a/manual.txt b/manual.txt index fe4d311..2969c13 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-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 ). 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. -----------------------------------------------------------------------------