X-Git-Url: https://git.shemshak.org/gitweb.cgi/~bandali/configs/blobdiff_plain/1512d34ef5d6712c20c63e6d2a221128cf81d03b..535c73d96e2cf9adbd2dfa31d87f4b7960359926:/.config/git/config?ds=sidebyside diff --git a/.config/git/config b/.config/git/config index fa7584e..f1ac520 100644 --- a/.config/git/config +++ b/.config/git/config @@ -10,7 +10,7 @@ # signoff = true [core] - autocrlf = input # CRLF -> LF on commit +# autocrlf = input # CRLF -> LF on commit editor = emacsclient -t pager = "less" @@ -77,10 +77,14 @@ [url "bandali@git.launchpad.net:"] insteadof = lp: +[url "git@salsa.debian.org:"] + insteadof = salsa: [url "git@salsa.debian.org:gnome-team/"] insteadof = pkg-gnome: [url "git@salsa.debian.org:bandali/"] insteadof = salsa-bandali: +[url "git@github.com:"] + insteadof = gh: [merge "dpkg-mergechangelogs"] name = debian/changelog merge driver driver = dpkg-mergechangelogs -m %O %A %B %A