diff options
Diffstat (limited to 'tigrc')
-rw-r--r-- | tigrc | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -96,10 +96,10 @@ bind main a !>git commit --amend | |||
96 | bind main 3 >git commit --allow-empty -m "%(prompt Empty commit, enter message: )" | 96 | bind main 3 >git commit --allow-empty -m "%(prompt Empty commit, enter message: )" |
97 | 97 | ||
98 | # merge | 98 | # merge |
99 | bind main m ?git merge %(commit) | 99 | bind main m ?@git merge %(commit) |
100 | bind main M ?git merge %(branch) --no-ff | 100 | bind main M ?@git merge %(branch) --no-ff |
101 | bind main gm ?git merge %(remote)/%(branch) # merge with current remote | 101 | bind main gm ?@git merge %(remote)/%(branch) # merge with current remote |
102 | bind main gM ?git merge %(remote)/%(branch) --no-ff # merge-no-ff with current remote | 102 | bind main gM ?@git merge %(remote)/%(branch) --no-ff # merge-no-ff with current remote |
103 | 103 | ||
104 | # push | 104 | # push |
105 | bind main p none # override default pager binding | 105 | bind main p none # override default pager binding |