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).
+',' Move tree view to the parent tree.
+e Open file in editor.
-----------------------------------------------------------------------------
[[external-commands]]
REQ_(TOGGLE_REV_GRAPH, "Toggle revision graph visualization"), \
REQ_(STATUS_UPDATE, "Update file status"), \
REQ_(STATUS_MERGE, "Merge file using external tool"), \
+ REQ_(TREE_PARENT, "Switch to parent directory in tree view"), \
REQ_(EDIT, "Open in editor"), \
REQ_(NONE, "Do nothing")
{ ':', REQ_PROMPT },
{ 'u', REQ_STATUS_UPDATE },
{ 'M', REQ_STATUS_MERGE },
+ { ',', REQ_TREE_PARENT },
{ 'e', REQ_EDIT },
/* Using the ncurses SIGWINCH handler. */
{
enum open_flags flags;
+ if (request == REQ_TREE_PARENT) {
+ if (*opt_path) {
+ /* fake 'cd ..' */
+ request = REQ_ENTER;
+ line = &view->line[1];
+ } else {
+ /* quit view if at top of tree */
+ return REQ_VIEW_CLOSE;
+ }
+ }
if (request != REQ_ENTER)
return request;
toggle-rev-graph Toggle revision graph visualization
status-update Update file status
status-merge Resolve unmerged file
+tree-parent Switch to parent directory in tree view
edit Open in editor
------------------------------------------------------------------------------