diff options
-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] |