]> 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 (from parent 1: 0da936e)
add squash and fixup aliases
authormartin f. krafft <madduck@madduck.net>
Mon, 8 Jul 2013 12:32:11 +0000 (14:32 +0200)
committermartin f. krafft <madduck@madduck.net>
Mon, 8 Jul 2013 12:32:11 +0000 (14:32 +0200)
.gitconfig patch | blob | history

diff --git a/.gitconfig b/.gitconfig
index 0682c0200acc1553e140cbe3da22b3b62d801f36..a2e8b44c33f2648089ddedbfe31469a5ae126d0d 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -17,6 +17,8 @@
        files = ls-files -v --deleted --modified --others --directory --no-empty-directory --exclude-standard
        sum = log --pretty=format:\"%h %Cblue%ci%Creset %Cgreen%cn%Creset %s\"
        unstage = reset HEAD
        files = ls-files -v --deleted --modified --others --directory --no-empty-directory --exclude-standard
        sum = log --pretty=format:\"%h %Cblue%ci%Creset %Cgreen%cn%Creset %s\"
        unstage = reset HEAD
+       sq = "!merge_squash_commit() { git merge --squash \"$1\" && git commit -m \"$1 squash\"; }; merge_squash_commit"
+       fixup = "!fixup_commit() { local c=\"$1\"; shift; git commit --fixup=\"$c\" \"$@\"; }; fixup_commit"
 [clean]
        requireForce = true
 [branch]
 [clean]
        requireForce = true
 [branch]
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.