diff options
| author | Hsieh Chin Fan <typebrook@gmail.com> | 2021-11-17 11:17:42 +0800 |
|---|---|---|
| committer | Hsieh Chin Fan <typebrook@gmail.com> | 2021-11-17 11:17:42 +0800 |
| commit | cb18abf913614f832c6155a832574ab8dc7ab43f (patch) | |
| tree | 88c44daf34f836896ee5a321225efc792956ea0d | |
| parent | f20f8204472a508cf19f4f3cdcf08c30e29a75fa (diff) | |
update
| -rw-r--r-- | tigrc | 2 |
1 files changed, 2 insertions, 0 deletions
| @@ -255,6 +255,8 @@ bind status d ?>rm %(file) | |||
| 255 | bind status D ?>git clean -df | 255 | bind status D ?>git clean -df |
| 256 | 256 | ||
| 257 | # solve conflict | 257 | # solve conflict |
| 258 | bind status M none | ||
| 259 | bind status Mo @git checkout --ours -- %(file) | ||
| 258 | bind status U ?>git reset --hard | 260 | bind status U ?>git reset --hard |
| 259 | bind status gc @git clean --force | 261 | bind status gc @git clean --force |
| 260 | bind status Ba @git rebase --abort | 262 | bind status Ba @git rebase --abort |