christoph.hollizeck 6f81c7c6e4 use merge instead of rebase		2024-03-27 14:42:41 +01:00
..
direnv	added plugins to fish, not sure if all of them are working	2024-03-27 10:57:25 +01:00
git	use merge instead of rebase	2024-03-27 14:42:41 +01:00