Update git settings

This commit is contained in:
Andrew Tomaka 2013-04-29 02:16:39 -04:00
parent 495c21a819
commit 2d1f20e922
2 changed files with 17 additions and 10 deletions

View file

@ -1,11 +1,13 @@
alias a="ls -la" alias a="ls -la"
alias al="zsh_stats" alias al="zsh_stats"
alias gcm="git commit -m"
alias gs="git status"
alias gaa="git add ."
alias ga="git add" alias ga="git add"
alias gaa="git add ."
alias gcm="git commit -m"
alias gd="git diff"
alias gl="git log" alias gl="git log"
alias gh="git hist"
alias grm="git rm" alias grm="git rm"
alias gs="git status"
alias l="ls -lvh --color=auto" alias l="ls -lvh --color=auto"
alias s="cd ~/Source" alias s="cd ~/Source"
alias v="vim" alias v="vim"

View file

@ -1,6 +1,13 @@
[user] [user]
name = Andrew Tomaka name = Andrew Tomaka
email = atomaka@gmail.com email = atomaka@gmail.com
[github]
user = atomaka
[apply]
whitespace = fix
[alias]
hist = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
[color] [color]
ui = auto ui = auto
[color "branch"] [color "branch"]
@ -16,14 +23,12 @@
added = yellow added = yellow
changed = green changed = green
untracked = cyan untracked = cyan
[merge]
tool = vimdiff
[apply]
whitespace = fix
[core] [core]
excludesfile = ~/.gitignore_global excludesfile = ~/.gitignore_global
autocrlf = input autocrlf = input
editor = subl editor = subl
filemode = false filemode = false
[merge]
tool = vimdiff
[push] [push]
default = upstream default = upstream