]> 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:

projects / etc / git.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
cleanup gui config
[etc/git.git] / .gitconfig
diff --git a/.gitconfig b/.gitconfig
index ee3ea534b7f2be59b38d768f69b37df2df9b828b..1978b30024be644336db58a9f141f4ee4e879598 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -5,6 +5,9 @@
 [core]
        pager = "less --quit-if-one-screen --raw-control-chars --no-init --hilite-search --SILENT"
        quotePath = false
 [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]
 [diff]
        renames = copies
 [alias]
@@ -28,8 +31,6 @@
        driver = dpkg-mergechangelogs -m %O %A %B %A
 [diff]
        tool = vimdiff
        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
 [color]
        branch = auto
        diff = auto
@@ -65,5 +66,7 @@
        enabled = true
 [rebase]
        autosquash = true
        enabled = true
 [rebase]
        autosquash = true
+[pull]
+       rebase = merges
 [advice]
        ignoredHook = false
 [advice]
        ignoredHook = false
git configuration

Legalese

All content available in this repository is copyright © martin f. krafft, unless otherwise noted.

All files and their content are released under the terms of the Artistic Licence 2.0, unless otherwise noted.

The operator of this repository shall not be held liable for offending content in pages linking to or linked from these page, nor does he endorse their content unless stated otherwise.