X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.gitconfig;h=f5605cf6e2a23511df7f38b87b24a51fb3a154f9;hb=761f73a4e79bbf4e28d975a8aa623d3d250bbe58;hp=61b2d1398b9c4dc148eb3c396aea658cc30c5025;hpb=493922317302f58ff78f291ca8f23c03b3e86d68;p=dotfiles.git

diff --git a/.gitconfig b/.gitconfig
index 61b2d13..f5605cf 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -95,7 +95,7 @@
 
   ssb = status --short --branch
 
-  aliases = "!git config --get-regexp '^alias\\.' | colrm 1 6 | sed 's/ / = /'"
+  aliases = "!git config --get-regexp '^alias\\.' | cut -c7- | sed 's/ / = /'"
 
   add-alias = "!f() { [ $# = 3 ] && git config $1 alias.\"$2\" \"$3\" && return 0 || echo \"Usage: git add-(local|global)-alias <new alias> <original command>\" >&2 && return 1; }; f"
   add-global-alias = "!exec git add-alias --global"
@@ -130,6 +130,12 @@
   # Get the current branch name
   branch-name = rev-parse --abbrev-ref HEAD
 
+  assume   = update-index --assume-unchanged
+  unassume = update-index --no-assume-unchanged
+  # assume-all = "!git st -s | awk {'print $2'} | xargs git assume"
+  unassume-all = "!git assumed | xargs git update-index --no-assume-unchanged"
+  assumed  = !"git ls-files -v | grep ^h | cut -c 3-"
+
 	branches = branch --all
 	ca = commit --all
 	cv = commit --verbose
@@ -138,9 +144,12 @@
 	checkin = commit
 	ci = commit
 	cat = cat-file -p
+	dir = rev-parse --git-dir
 	dump = cat-file -p
 	file = cat-file -t
 	type = cat-file -t
+	ff = merge --ff-only
+	git = !git
 	l1 = log --decorate --oneline
 	l5 = log --decorate -5
 	ld = log --decorate
@@ -187,6 +196,7 @@
 
 [push]
 	default = simple
+	followTags = true
 
 [receive]
 	denyNonFastForwards = true
@@ -200,3 +210,17 @@
 [gui]
 	fontui = -family \"DejaVu Sans\" -size 18 -weight normal -slant roman -underline 0 -overstrike 0
 	fontdiff = -family \"DejaVu Sans Mono\" -size 18 -weight normal -slant roman -underline 0 -overstrike 0
+
+# Github URL shortcuts
+[url "git@github.com:"]
+	insteadOf = "gh:"
+	pushInsteadOf = "github:"
+	pushInsteadOf = "git://github.com/"
+[url "git://github.com/"]
+	insteadOf = "github:"
+[url "git@gist.github.com:"]
+	insteadOf = "gst:"
+	pushInsteadOf = "gist:"
+	pushInsteadOf = "git://gist.github.com/"
+[url "git://gist.github.com/"]
+	insteadOf = "gist:"