diff options
| author | Yigit Sever | 2020-09-16 14:44:55 +0300 |
|---|---|---|
| committer | Yigit Sever | 2020-09-16 14:44:55 +0300 |
| commit | 10ccdf06fe817084b8a5d86f51770a5fdc5f6341 (patch) | |
| tree | cd4d4c2f63f2bc53e3db71ea92f332edb5f4dc02 | |
| parent | 2852e51b35282edbbdd25e126d3fa3312c5d3180 (diff) | |
| download | dotfiles-10ccdf06fe817084b8a5d86f51770a5fdc5f6341.tar.gz dotfiles-10ccdf06fe817084b8a5d86f51770a5fdc5f6341.tar.bz2 dotfiles-10ccdf06fe817084b8a5d86f51770a5fdc5f6341.zip | |
use vim conflicted for git
| -rw-r--r-- | .gitconfig | 1 |
1 files changed, 1 insertions, 0 deletions
| @@ -16,6 +16,7 @@ | |||
| 16 | type = cat-file -t | 16 | type = cat-file -t |
| 17 | dump = cat-file -p | 17 | dump = cat-file -p |
| 18 | adog = log --all --decorate --oneline --graph | 18 | adog = log --all --decorate --oneline --graph |
| 19 | conflicted = !nvim +Conflicted | ||
| 19 | [credential] | 20 | [credential] |
| 20 | helper = cache --timeout=3600 | 21 | helper = cache --timeout=3600 |
| 21 | [color] | 22 | [color] |