15 Commits

Author	SHA1	Message	Date
diginaut	5ad43aa897	20250425: use vimdiff with merge conflicts; default git branch is 'main'	2025-05-13 13:39:24 +02:00
diginaut	90037e0486	20231009: for slow servers	2023-12-08 08:46:26 +01:00
diginaut	3ef6363915	Trust those repo paths	2023-03-08 16:14:47 +01:00
diginaut	b6553f2771	Merge branch 'master' of github.com:aquatix/dotfiles	2022-08-28 19:55:27 +02:00
diginaut	8dc6017b69	Default strategy for reconciling divergent branches	2020-05-25 10:19:23 +02:00
diginaut	9ef543c20e	Global Git ignore file	2020-04-24 20:33:00 +02:00
diginaut	28dbd2d064	Useful Git aliases	2020-02-22 11:21:31 +01:00
diginaut	ff3afff43d	Show whitespace changes in diffs	2018-10-20 13:19:19 +02:00
diginaut	0e4fcdf3b8	Some useful aliases, for stats and such	2018-09-18 11:26:09 +02:00
diginaut	52f1243711	Handy aliases	2018-08-15 15:20:37 +02:00
diginaut	fa7fb8cb20	Because reasons	2017-11-06 11:42:36 +01:00
diginaut	7c05f8c95d	Changed commit email address to diginaut	2015-03-19 08:21:31 +01:00
Michiel Scholten	293abc2c61	git alias and some github/bitbucket config	2014-07-14 14:46:49 +02:00
Michiel Scholten	3c5db83bbe	Additions from work laptop	2014-05-21 14:00:22 +02:00
Michiel Scholten	7d3f9b79d5	Import	2014-05-05 20:42:08 +02:00