diff options
author | typebrook <typebrook@gmail.com> | 2020-03-23 09:50:02 +0800 |
---|---|---|
committer | typebrook <typebrook@gmail.com> | 2020-03-23 09:50:02 +0800 |
commit | 76ec5b54cf5eea12900a61f925c035e17dbec152 (patch) | |
tree | 1c986104b46236f6791643b6b27aa442a2a06487 | |
parent | fae608e2f4ae03236c0289f6f41ef09abca97eb7 (diff) |
update
-rw-r--r-- | tigrc | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -248,6 +248,8 @@ bind status U ?>git reset --hard | |||
248 | bind status gc @git clean --force | 248 | bind status gc @git clean --force |
249 | bind status Ba @git rebase --abort | 249 | bind status Ba @git rebase --abort |
250 | bind status Bc @git rebase --continue | 250 | bind status Bc @git rebase --continue |
251 | bind status Ma @git merge --abort | ||
252 | bind status Mc @git merge --continue | ||
251 | bind status <F4> !sh -c "git difftool -y \"$(git rev-parse --show-toplevel)/%(file)\"" | 253 | bind status <F4> !sh -c "git difftool -y \"$(git rev-parse --show-toplevel)/%(file)\"" |
252 | 254 | ||
253 | # apply patch file | 255 | # apply patch file |