Updated vimrc, profile and gitconfig
parent
2b525c0695
commit
e5257164d0
@ -1,56 +0,0 @@
|
||||
[user]
|
||||
name = <%= print("Your Name: "); STDOUT.flush; STDIN.gets.chomp %>
|
||||
email = <%= print("Your Email: "); STDOUT.flush; STDIN.gets.chomp %>
|
||||
[github]
|
||||
user = <%= print("GitHub Username: "); STDOUT.flush; STDIN.gets.chomp %>
|
||||
token = <%= print("GitHub API Token: "); STDOUT.flush; STDIN.gets.chomp %>
|
||||
|
||||
[core]
|
||||
excludesfile = <%= ENV['HOME'] %>/.gitignore
|
||||
editor = mvim -f
|
||||
autocrlf = input
|
||||
eol = lf
|
||||
whitespace=fix,-indent-with-non-tab,trailing-space,cr-at-eol
|
||||
|
||||
[color]
|
||||
ui = auto
|
||||
[color "branch"]
|
||||
current = yellow reverse
|
||||
local = yellow
|
||||
remote = green
|
||||
[color "diff"]
|
||||
meta = yellow bold
|
||||
frag = magenta bold
|
||||
old = red bold
|
||||
new = green bold
|
||||
whitespace = red reverse
|
||||
[color "status"]
|
||||
added = yellow
|
||||
changed = green
|
||||
untracked = cyan
|
||||
|
||||
[alias]
|
||||
st = status
|
||||
cm = commit
|
||||
co = checkout
|
||||
br = branch
|
||||
ps = push
|
||||
pl = pull
|
||||
hub = push origin master
|
||||
rmall = rm $(git ls-files --deleted)
|
||||
subup= submodule foreach git pull
|
||||
rs = reset master --hard
|
||||
hist = log --pretty=format:\"%h | %ad | %s%d [%an]\" --graph --date=local
|
||||
lo = log --graph --decorate --pretty=oneline --abbrev-commit --all
|
||||
type = cat-file -t
|
||||
dump = cat-file -p
|
||||
|
||||
[merge]
|
||||
tool = sourcetree
|
||||
summary = true
|
||||
[difftool "sourcetree"]
|
||||
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
|
||||
path =
|
||||
[mergetool "sourcetree"]
|
||||
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
|
||||
trustExitCode = true
|
Loading…
Reference in New Issue