.fvwmrc: Change big terminal size

[dotfiles.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 969d6d788343d6cb110a8855cc936e6e881f565b..b91ec8dc967666d20dc7d07680cec2248486e713 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -152,7 +152,7 @@
        file = cat-file -t
        type = cat-file -t
        ff = merge --ff-only
-       git = !exec git
+       #git = !exec git
        l1 = log --decorate --oneline
        l5 = log --decorate -5
        ld = log --decorate
@@ -178,7 +178,7 @@
        sw = show --word-diff --decorate
        unstage = reset HEAD --
 
-       pr = "!f() { git fetch ${2:-upstream} refs/pull/$1/head:pr/$1 && git checkout pr/$1; }; f"
+       pr = "!f() { git fetch ${2:-origin} refs/pull/$1/head:pr/$1 && git checkout pr/$1; }; f"
        clean-pr = "!git checkout master ; git for-each-ref refs/heads/pr/* --format=\"%(refname)\" | while read ref ; do branch=${ref#refs/heads/} ; git branch -D $branch ; done"
 
 [branch]
@@ -241,13 +241,9 @@
 # Github URL shortcuts
 [url "git@github.com:"]
        insteadOf = "gh:"
-       pushInsteadOf = "github:"
-       pushInsteadOf = "git://github.com/"
-[url "git://github.com/"]
        insteadOf = "github:"
+       insteadOf = "git://github.com/"
 [url "git@gist.github.com:"]
        insteadOf = "gst:"
-       pushInsteadOf = "gist:"
-       pushInsteadOf = "git://gist.github.com/"
-[url "git://gist.github.com/"]
        insteadOf = "gist:"
+       insteadOf = "git://gist.github.com/"