]> git.madduck.net Git - etc/git.git/commitdiff

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 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 04c5852)
set autosetupmerge and remove returnto alias
authormartin f. krafft <madduck@madduck.net>
Tue, 30 Sep 2008 06:29:22 +0000 (08:29 +0200)
committermartin f. krafft <madduck@madduck.net>
Tue, 30 Sep 2008 06:29:22 +0000 (08:29 +0200)
.gitconfig patch | blob | history

diff --git a/.gitconfig b/.gitconfig
index 56ae58f963853d77ffbbaa4530b463b7fb352b7a..02efd562d27233b000a35ebb5fac80cf2bfcdf22 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -14,7 +14,7 @@
        ci = commit -a
        stat = status
        files = ls-files -v --deleted --modified --others --directory --no-empty-directory --exclude-standard
-       returnto = "!git add . && git commit -m'stowing away trash' >/dev/null && d=$(date +%Y.%m.%d.%H.%M.%S) && git tag trash/$d && echo tagged unwanted worktree $(git rev-parse --short HEAD) with trash/$d && git reset --hard HEAD^ >/dev/null && git reset --hard"
 [clean]
        requireForce = true
-
+[branch]
+       autosetupmerge = true
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.