]> git.madduck.net Git - etc/git.git/blobdiff - .gitconfig

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

alioth is gone
[etc/git.git] / .gitconfig
index ee3ea534b7f2be59b38d768f69b37df2df9b828b..2ea964f961b526a6ad1e3ff47b1dba8171d8a523 100644 (file)
@@ -5,6 +5,9 @@
 [core]
        pager = "less --quit-if-one-screen --raw-control-chars --no-init --hilite-search --SILENT"
        quotePath = false
+       editor = sensible-editor +start
+[init]
+       defaultBranch = main
 [diff]
        renames = copies
 [alias]
        driver = dpkg-mergechangelogs -m %O %A %B %A
 [diff]
        tool = vimdiff
-[gui]
-       fontui = -family rotissansserif -size 10 -weight bold -slant roman -underline 0 -overstrike 0
 [color]
        branch = auto
        diff = auto
        interactive = auto
        status = auto
        ui = auto
-[url "ssh://git.debian.org/git/"]
-       insteadOf = alioth:
 [url "ssh://git@git.madduck.net/madduck/"]
        insteadOf = madduck:
 [url "git://git.madduck.net/madduck/pub/"]
@@ -65,5 +64,7 @@
        enabled = true
 [rebase]
        autosquash = true
+[pull]
+       rebase = merges
 [advice]
        ignoredHook = false