diff options
| author | typebrook <typebrook@gmail.com> | 2020-03-14 13:24:49 +0800 |
|---|---|---|
| committer | typebrook <typebrook@gmail.com> | 2020-03-14 13:24:49 +0800 |
| commit | 5b31dda7c991fe928fe615153e17230ceaf94e1d (patch) | |
| tree | 03a5f543d3019ae1cc02b56d1913bd6be0af6a21 /tigrc | |
| parent | 66670c62249a4d705a54de630326b1e147dcd4e7 (diff) | |
update
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 |