diff options
Diffstat (limited to 'tigrc')
-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 |