~mdw
/
tig
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tig-0.9.1
[tig]
/
tigrc.5.txt
diff --git
a/tigrc.5.txt
b/tigrc.5.txt
index
fa4f473
..
8e37efc
100644
(file)
--- a/
tigrc.5.txt
+++ b/
tigrc.5.txt
@@
-233,6
+233,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
+status-merge Resolve unmerged file
edit Open in editor
cherry-pick Cherry-pick commit to current branch
------------------------------------------------------------------------------
edit Open in editor
cherry-pick Cherry-pick commit to current branch
------------------------------------------------------------------------------