diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2013-08-17 22:16:13 +0200 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2013-08-17 22:16:13 +0200 |
| commit | e766d9fe1d0c5677214a0a100edf43e7056d7662 (patch) | |
| tree | eb93e10c81714e8ea7dd826fbcd7d217ced1dc87 /git | |
| download | dotfiles-mini-e766d9fe1d0c5677214a0a100edf43e7056d7662.tar.gz dotfiles-mini-e766d9fe1d0c5677214a0a100edf43e7056d7662.tar.bz2 dotfiles-mini-e766d9fe1d0c5677214a0a100edf43e7056d7662.zip | |
initial commit
Diffstat (limited to 'git')
| -rw-r--r-- | git/config | 32 | ||||
| -rw-r--r-- | git/globalignore | 7 |
2 files changed, 39 insertions, 0 deletions
diff --git a/git/config b/git/config new file mode 100644 index 0000000..dce751c --- /dev/null +++ b/git/config @@ -0,0 +1,32 @@ +[user] + name = Alexander Sulfrian + email = alex@spline.inf.fu-berlin.de + +[color] + diff = auto + status = auto + branch = auto + +[alias] + s = status + d = diff + co = checkout + ci = commit + b = branch + sta = stash + civ = commit -v + cim = commit -m + k = !gitk --all + fm = merge --ff-only + nfm = merge --no-ff + tags = tag + l = log --graph --all --abbrev-commit --decorate --format=oneline + +[core] + pager = less -X -R -F + +[merge] + log = true + +[rerere] + enabled = true diff --git a/git/globalignore b/git/globalignore new file mode 100644 index 0000000..c2e7b7d --- /dev/null +++ b/git/globalignore @@ -0,0 +1,7 @@ +.promptignore +\#*# +.\#* +*~ +*.pyc +.ropeproject/ +.dir-locals.el |