aboutsummaryrefslogtreecommitdiffhomepage
path: root/tigrc
diff options
context:
space:
mode:
Diffstat (limited to 'tigrc')
-rw-r--r--tigrc1
1 files changed, 1 insertions, 0 deletions
diff --git a/tigrc b/tigrc
index f3ad7a6..26c96c3 100644
--- a/tigrc
+++ b/tigrc
@@ -127,6 +127,7 @@ bind main m ?@git merge %(commit)
127bind main M ?@git merge %(branch) --no-ff 127bind main M ?@git merge %(branch) --no-ff
128bind main gm ?@git merge %(remote)/%(branch) # merge with current remote 128bind main gm ?@git merge %(remote)/%(branch) # merge with current remote
129bind main gM ?@git merge %(remote)/%(branch) --no-ff # merge-no-ff with current remote 129bind main gM ?@git merge %(remote)/%(branch) --no-ff # merge-no-ff with current remote
130bind main gs ?@git merge %(branch) --squash
130 131
131# push 132# push
132bind main p none # override default pager binding 133bind main p none # override default pager binding