|
|
|
@ -1,5 +1,5 @@
|
|
|
|
|
# |
|
|
|
|
# 2009-2011 Nico Schottelius (nico-configfiles at schottelius.org) |
|
|
|
|
# 2009-2013 Nico Schottelius (nico-configfiles at schottelius.org) |
|
|
|
|
# |
|
|
|
|
# This file is part of nsdotfiles. |
|
|
|
|
# |
|
|
|
@ -42,7 +42,7 @@
|
|
|
|
|
m = merge |
|
|
|
|
p = push |
|
|
|
|
pl = pull |
|
|
|
|
plp = !git pull && git push |
|
|
|
|
pnp = !git pull && git push |
|
|
|
|
r = reset |
|
|
|
|
s = status |
|
|
|
|
t = tag |
|
|
|
@ -69,14 +69,18 @@
|
|
|
|
|
|
|
|
|
|
[color] |
|
|
|
|
ui = auto |
|
|
|
|
|
|
|
|
|
# |
|
|
|
|
# PRIVATE STUFF |
|
|
|
|
# PRIVATE STUFF - probably not usable for you |
|
|
|
|
# |
|
|
|
|
|
|
|
|
|
[user] |
|
|
|
|
email = nico@HOSTNAME |
|
|
|
|
email = nico@bento.schottelius.org |
|
|
|
|
name = Nico Schottelius |
|
|
|
|
|
|
|
|
|
[cia] |
|
|
|
|
email = nico-cia.vc@HOSTNAME |
|
|
|
|
email = nico-cia.vc@schottelius.org |
|
|
|
|
url= http://git.schottelius.org/?p=@@project@@;a=commit;h=@@sha1@@ |
|
|
|
|
|
|
|
|
|
[irker] |
|
|
|
|
channels = irc://chat.freenode.net/cstar,irc://chat.freenode.net/commits |
|
|
|
|