]> 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
update prompt vars after git command runs
[etc/git.git] / .gitconfig
diff --git a/.gitconfig b/.gitconfig
index 9a47169b8817bef3adf3bb3a0068179a3016992f..170d504461a21f720a53e343b5dcd1e6937730f0 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -8,7 +8,6 @@
 [diff]
        renames = copies
 [alias]
 [diff]
        renames = copies
 [alias]
-       restore = checkout HEAD
        dist = "!git archive --format=tar -v --prefix=$(git describe HEAD | sed -e 's,-,///,;s,-,+,g;s,///,-,')/ HEAD | gzip -9 > ../$(git describe HEAD | sed -e 's,-,///,;s,-,+,g;s,///,-,').tar.gz"
        ddist = "!git dist && mv ../$(git describe HEAD | sed -e 's,-,///,;s,-,+,g;s,///,-,').tar.gz ../$(git describe HEAD | sed -e 's,-,_,;s,-,+,g').orig.tar.gz"
        files = ls-files -v --deleted --modified --others --directory --no-empty-directory --exclude-standard
        dist = "!git archive --format=tar -v --prefix=$(git describe HEAD | sed -e 's,-,///,;s,-,+,g;s,///,-,')/ HEAD | gzip -9 > ../$(git describe HEAD | sed -e 's,-,///,;s,-,+,g;s,///,-,').tar.gz"
        ddist = "!git dist && mv ../$(git describe HEAD | sed -e 's,-,///,;s,-,+,g;s,///,-,').tar.gz ../$(git describe HEAD | sed -e 's,-,_,;s,-,+,g').orig.tar.gz"
        files = ls-files -v --deleted --modified --others --directory --no-empty-directory --exclude-standard
@@ -49,8 +48,6 @@
        pushInsteadOf = git://git.madduck.net/madduck/pub/
 [url "ssh://git.madduck.net/madduck/pub/"]
        insteadOf = madduck-pub:
        pushInsteadOf = git://git.madduck.net/madduck/pub/
 [url "ssh://git.madduck.net/madduck/pub/"]
        insteadOf = madduck-pub:
-[url "ssh://git.madduck.net/pm/"]
-       insteadOf = pm:
 [url "ssh://git@git.madduck.net/gitolite-admin"]
        insteadOf = gitolite-admin:
 [url "ssh://git@admin.madduck.net/"]
 [url "ssh://git@git.madduck.net/gitolite-admin"]
        insteadOf = gitolite-admin:
 [url "ssh://git@admin.madduck.net/"]
@@ -68,3 +65,7 @@
        enabled = true
 [rebase]
        autosquash = true
        enabled = true
 [rebase]
        autosquash = true
+[pull]
+       rebase = merges
+[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.