Commit graph

16 commits

Author SHA1 Message Date
436526ffb9 Add git aliases 2024-08-15 09:11:45 +03:00
26bcca97ba 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
bb75584fa2 Nvim: add diffview plugin 2024-01-24 13:52:09 +02:00
2bf1f47b2f Git: enable submodule check on push 2023-11-07 14:16:03 +02:00
48a1f9901f Git: enable automatic update of submodules 2023-11-07 14:07:52 +02:00
09b1a3a47a Git: add recommit alias 2023-08-21 16:58:18 +03:00
96db564b83 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
80b724faf9 Git: Switch back to nvim for diff and mergetool 2023-05-25 08:42:00 +03:00
aac4c7b266 Git: remove unneeded configuration for meld diff/mergetools 2023-05-23 22:20:27 +03:00
747a44d61e Add meld as git (merge|diff)tool 2023-05-23 22:04:32 +03:00
0ad3a4eb1e Git: change order of windows in neovim mergetool 2022-11-04 13:39:43 +02:00
Marko Korhonen
1206df05cc Git: enable rerere and diff3 mode 2022-11-04 12:49:31 +02:00
5c6d81c7ff Add git credential helpers 2022-09-06 11:38:00 +03:00
7bc1240454 Update git config to new GPG key 2022-08-28 19:28:16 +03:00
a3fab5a6bb Fix git difftool 2022-08-23 22:15:18 +03:00
c0d8b72f0e Move git config to standard xdg path out of home directory 2022-08-02 17:12:18 +03:00