diff options
Diffstat (limited to 'tigrc')
-rw-r--r-- | tigrc | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -127,6 +127,7 @@ bind main m ?@git merge %(commit) | |||
127 | bind main M ?@git merge %(branch) --no-ff | 127 | bind main M ?@git merge %(branch) --no-ff |
128 | bind main gm ?@git merge %(remote)/%(branch) # merge with current remote | 128 | bind main gm ?@git merge %(remote)/%(branch) # merge with current remote |
129 | bind main gM ?@git merge %(remote)/%(branch) --no-ff # merge-no-ff with current remote | 129 | bind main gM ?@git merge %(remote)/%(branch) --no-ff # merge-no-ff with current remote |
130 | bind main gs ?@git merge %(branch) --squash | ||
130 | 131 | ||
131 | # push | 132 | # push |
132 | bind main p none # override default pager binding | 133 | bind main p none # override default pager binding |