Marko Korhonen
e3e9848d0e
Remove git mergetool and difftool, use zsh diffview alias instead
...
This is because as a git tool, it wants to open each file separately.
Neovim and diffview plugin provide a handy UI to manage multiple files
in diff and merge
9 months ago
Marko Korhonen
845f4024df
Nvim: add diffview plugin
9 months ago
Marko Korhonen
8929c69dd8
Git: enable submodule check on push
12 months ago
Marko Korhonen
a67ad971ea
Git: enable automatic update of submodules
12 months ago
Marko Korhonen
a489d13bf0
Git: add recommit alias
1 year ago
Marko Korhonen
2f9bc0ae5f
Git: Remove all whitespace at the beginning of lines
...
The whitespace is not needed and makes the file more TOML like (more readable)
1 year ago
Marko Korhonen
82d7b1fbca
Git: Switch back to nvim for diff and mergetool
1 year ago
Marko Korhonen
e2eb38516b
Git: remove unneeded configuration for meld diff/mergetools
1 year ago
Marko Korhonen
4e59e69155
Add meld as git (merge|diff)tool
1 year ago
Marko Korhonen
c2ea91bca0
Git: change order of windows in neovim mergetool
2 years ago
Marko Korhonen
1962505d8e
Git: enable rerere and diff3 mode
2 years ago
Marko Korhonen
1542a1a73a
Add git credential helpers
2 years ago
Marko Korhonen
76e2278349
Update git config to new GPG key
2 years ago
Marko Korhonen
bce2d6d6b1
Fix git difftool
2 years ago
Marko Korhonen
6ccbf70b57
Move git config to standard xdg path out of home directory
2 years ago