Updated vimrc, profile and gitconfig

main
Steffen Becker 12 years ago
parent 2b525c0695
commit e5257164d0

@ -3,7 +3,7 @@
This is a collection of my dotfiles. To install on your local machine run the following commands:
```
git clone git://github.com/nebelschwade/dotfiles ~/Dotfiles
git clone git://github.com/nebelschwade/Dotfiles ~/Dotfiles
cd ~/Dotfiles
ln -s ~/Dotfiles/vim ~/.vim
ln -s ~/Dotfiles/gitconfig ~/.gitconfig

@ -33,8 +33,7 @@
ps = push
pl = pull
hub = push origin master
rmall = rm $(git ls-files --deleted)
subup= submodule foreach git pull
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

@ -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

@ -62,6 +62,7 @@ alias d='cd ~/Dotfiles && ls'
# Gitty gitgit
alias gti='git'
alias g='git'
alias grm='git rm $(git ls-files --deleted)'
alias deploy='dandelion deploy'
alias status='dandelion status'

@ -92,7 +92,6 @@ set visualbell " don't beep
" set the leader to comma , and ; == : -- faster commands
let mapleader = ","
nnoremap ; :
nnoremap : ;
" jk nice behaviour (screen lines vs. shown lines)
nnoremap j gj

Loading…
Cancel
Save