Commit graph

15 commits

Author SHA1 Message Date
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
2024-01-24 22:51:17 +02:00
845f4024df
Nvim: add diffview plugin 2024-01-24 13:52:09 +02:00
8929c69dd8
Git: enable submodule check on push 2023-11-07 14:16:03 +02:00
a67ad971ea
Git: enable automatic update of submodules 2023-11-07 14:07:52 +02:00
a489d13bf0
Git: add recommit alias 2023-08-21 16:58:18 +03:00
2f9bc0ae5f
Git: Remove all whitespace at the beginning of lines
The whitespace is not needed and makes the file more TOML like (more readable)
2023-05-25 08:44:50 +03:00
82d7b1fbca
Git: Switch back to nvim for diff and mergetool 2023-05-25 08:42:00 +03:00
e2eb38516b
Git: remove unneeded configuration for meld diff/mergetools 2023-05-23 22:20:27 +03:00
4e59e69155
Add meld as git (merge|diff)tool 2023-05-23 22:04:32 +03:00
c2ea91bca0
Git: change order of windows in neovim mergetool 2022-11-04 13:39:43 +02:00
Marko Korhonen
1962505d8e
Git: enable rerere and diff3 mode 2022-11-04 12:49:31 +02:00
1542a1a73a
Add git credential helpers 2022-09-06 11:38:00 +03:00
76e2278349
Update git config to new GPG key 2022-08-28 19:28:16 +03:00
bce2d6d6b1
Fix git difftool 2022-08-23 22:15:18 +03:00
6ccbf70b57
Move git config to standard xdg path out of home directory 2022-08-02 17:12:18 +03:00
Renamed from home/.gitconfig (Browse further)