commit eeb6fdd3f6a50ce9cb7757e825e0365671625183
parent 729600ce7cb63013c5b93a25fdb57ae4357bf750
Author: Antoine Amarilli <a3nm@a3nm.net>
Date: Sun, 4 Feb 2018 21:10:19 +0100
Merge branch 'master' of a3nm.net:git/myconfig
Diffstat:
2 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/apt/server b/apt/server
@@ -69,6 +69,7 @@ manpages
tig
myrepos # update multiple repositories
git-svn
+git-email
lbdb
elinks # to view HTML in mutt
diff --git a/gitconfig b/gitconfig
@@ -36,3 +36,5 @@
[merge "set"]
name = set merger
driver = ~/bin/git-merge-set %O %A %B %L
+[include]
+ path = ~/config/private/gitconfig