diff options
| author | typebrook <typebrook@gmail.com> | 2019-05-20 09:08:46 +0800 |
|---|---|---|
| committer | typebrook <typebrook@gmail.com> | 2019-05-20 09:08:46 +0800 |
| commit | aa2fb8aee76c16e82bba7228644d320972d9350d (patch) | |
| tree | bbf7a80768b25946c1114b61145a9b0601a152e9 | |
| parent | 15f2fd8eed48cb1d8dde3e48586b62d67a77655a (diff) | |
update
| -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 |