Commit graph

15 commits

Author SHA1 Message Date
Marko Korhonen 9f7c3e6466 Git: don't keep backup when using mergetool 2021-11-30 16:56:15 +02:00
Marko Korhonen e60da2386e Update mergetest git alias 2021-11-02 10:21:31 +02:00
Marko Korhonen 1f0d882745 Change git diff tool configuration 2021-08-18 09:30:09 +03:00
Marko Korhonen f6fc1d4bdf Switch from nvimpager to just nvim as pager 2021-08-17 17:43:30 +03:00
Marko Korhonen 029bd1e41f Add push to git mergetest alias 2021-08-12 09:37:45 +03:00
Marko Korhonen 32e6a78a37 Add mergetest git alias 2021-08-10 11:31:19 +03:00
Marko Korhonen 60c1448c79 Dynamic git config for work laptop 2021-07-16 11:28:57 +03:00
Marko Korhonen 928436c167 Add rebase merges to gitconfig 2021-05-18 09:03:12 +03:00
Marko Korhonen 9e41240cdd Change git config to use new mail address 2020-11-25 10:19:18 +02:00
Marko Korhonen 1bc0815dd4 Added new rebase option 2020-06-27 11:07:51 +03:00
Marko Korhonen ca22f887f1 Revised git config difftool and mergetool 2020-01-21 19:19:44 +02:00
Marko Korhonen eb960a0826 Add pgp sign and signoff to git global config
Signed-off-by: Marko Korhonen <marko.korhonen@reekynet.com>
2020-01-21 17:32:35 +02:00
Marko Korhonen 46a7f1ee52 Fixed vimdiff
Signed-off-by: Marko Korhonen <marko.korhonen@reekynet.com>
2019-10-27 22:48:21 +02:00
Marko Korhonen 1f36f65eff Made neovim work as vimdiff
Signed-off-by: Marko Korhonen <marko.korhonen@reekynet.com>
2019-10-27 22:43:52 +02:00
Marko Korhonen b1335a3628 Removed commit history
Signed-off-by: Marko Korhonen <marko.korhonen@reekynet.com>
2019-10-26 20:05:31 +03:00