86 lines
1.9 KiB
Text
86 lines
1.9 KiB
Text
#
|
|
# 2009-2013 Nico Schottelius (nico-configfiles at schottelius.org)
|
|
#
|
|
# This file is part of nsdotfiles.
|
|
#
|
|
# nsdotfiles is free software: you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation, either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# nsdotfiles is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with nsdotfiles. If not, see <http://www.gnu.org/licenses/>.
|
|
#
|
|
|
|
[alias]
|
|
a = add
|
|
b = branch
|
|
ba = branch -a
|
|
bi = bisect
|
|
c = commit -s
|
|
cl = clone
|
|
ca = commit -a -s
|
|
co = checkout
|
|
d = diff
|
|
dc = diff --color
|
|
f = fetch
|
|
|
|
l = log
|
|
lc = log --color
|
|
ln = log --name-only
|
|
lo = log --pretty=oneline
|
|
lp = log -p --abbrev-commit
|
|
loc = log --color --pretty=oneline
|
|
lol = log --pretty=oneline --abbrev-commit --graph --decorate
|
|
lpc = log -p --color --abbrev-commit
|
|
|
|
m = merge
|
|
p = push
|
|
pl = pull
|
|
pnp = !git pull && git push
|
|
r = reset
|
|
s = status
|
|
t = tag
|
|
|
|
# Useful for SVN operation
|
|
srb = svn rebase
|
|
sdc = svn dcommit
|
|
srd = !git svn rebase && git svn dcommit
|
|
|
|
[core]
|
|
excludesfile = /home/users/nico/.gitignore-global
|
|
|
|
[http]
|
|
sslVerify=false
|
|
|
|
[pager]
|
|
status = true
|
|
|
|
[merge]
|
|
tool = vimdiff
|
|
|
|
[push]
|
|
default = matching
|
|
|
|
[color]
|
|
ui = auto
|
|
|
|
#
|
|
# PRIVATE STUFF - probably not usable for you
|
|
#
|
|
|
|
[user]
|
|
email = nico@bento.schottelius.org
|
|
name = Nico Schottelius
|
|
|
|
[cia]
|
|
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
|