diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-01-27 20:52:59 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-01-27 20:52:59 -0500 |
commit | 786fcda41a731654dd2de7496d5f28bc7bb19743 (patch) | |
tree | ab557aa22a6463fd15667ec738b12f7fd78d7aa1 /.gitconfig | |
parent | 614636d8e5a1f643d3c91d0d5e52482aef38bb5e (diff) | |
parent | 5f7de477be298f158369862c1a3cc80286fc7e32 (diff) |
Merge remote-tracking branch 'origin/master' into build64-par
Conflicts:
.kde/share/apps
.kde/share/config
.kde4
Diffstat (limited to '.gitconfig')
-rw-r--r-- | .gitconfig | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -8,3 +8,7 @@ smtpserver = plus.smtp.mail.yahoo.com smtpuser = lukeshu@sbcglobal.net smtpserverport = 465 +[push] + default = matching +[alias] + lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative |