summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a2cebdb)
raw | patch | inline | side by side (parent: a2cebdb)
author | Jonas Fonseca <fonseca@diku.dk> | |
Sat, 24 Jan 2009 11:51:38 +0000 (12:51 +0100) | ||
committer | Jonas Fonseca <fonseca@diku.dk> | |
Tue, 27 Jan 2009 23:17:37 +0000 (00:17 +0100) |
manual.txt | patch | blob | history | |
tigrc.5.txt | patch | blob | history |
diff --git a/manual.txt b/manual.txt
index fe4d311be4c5f0a30de3199ed7d1825325101ef3..7df984604bb8afe0464ab1d66b0ae37b316ff611 100644 (file)
--- a/manual.txt
+++ b/manual.txt
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 <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]]
Cursor Navigation
~~~~~~~~~~~~~~~~~
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.
-----------------------------------------------------------------------------
diff --git a/tigrc.5.txt b/tigrc.5.txt
index 3da0d2f9a3a09589206dec85294498d0f303e791..0090ca770d7ae25758368be225fa8643652b38f7 100644 (file)
--- a/tigrc.5.txt
+++ b/tigrc.5.txt
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"]
`-----------------------`-----------------------------------------------------
endif::backend-xhtml11[]
Misc:
------------------------------------------------------------------------------
-none Do nothing
prompt Bring up the prompt
screen-redraw Redraw the screen
screen-resize Resize the screen
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
------------------------------------------------------------------------------