Skip to content

Commit

Permalink
gitconfig, global gitignore
Browse files Browse the repository at this point in the history
  • Loading branch information
rwoeber committed Dec 28, 2014
1 parent 34da53a commit df7bd48
Show file tree
Hide file tree
Showing 3 changed files with 183 additions and 0 deletions.
106 changes: 106 additions & 0 deletions tag-git/gitconfig
@@ -0,0 +1,106 @@
[user]
name = Richard Wöber
email = rwoeber@me.com
signingkey = B3A85AFD

[core]
whitespace=fix,-indent-with-non-tab,trailing-space,cr-at-eol
editor = vim
pager = less -FXRS
excludesfile = ~/.gitignore_global
autocrlf = input
trustctime = false

[alias]
aa = add --all :/
s = status -sb
ignored = status -s --ignored
d = diff
dw = diff --ignore-space-at-eol -b -w --ignore-blank-lines
dc = diff --cached
dt = difftool
dtw = difftool --ignore-space-at-eol -b -w --ignore-blank-lines
co = checkout
cob = checkout -b
cot = checkout -t
ci = commit
cia = commit --amend
wip = commit -m 'WIP'
pur = pull --rebase
amend = commit --amend -C HEAD
ready = rebase -i @{u}
br = branch
rmuntracked = "!git ls-files --others --exclude-standard | xargs rm"
rmdeleted = "!git ls-files --deleted -z | xargs -0 git rm"
unstage = "reset HEAD "
ls = log --pretty=format:'%Cred%h %C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'
ll = log --pretty=format:'%Cred%h %C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --numstat
lola = log --pretty=format:'%Cred%h%Creset %C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --graph --decorate --all
backup = push --force --mirror backup
human = name-rev --name-only --refs='refs/heads/*'
assume = update-index --assume-unchanged
unassume = update-index --no-assume-unchanged
assumed = "!git ls-files -v | grep ^h | cut -c 3-"
alias = "!git config -l | grep alias | cut -c 7-"
lasttag = describe --tags --abbrev=0
serve = daemon --verbose --export-all --base-path=.git --reuseaddr --strict-paths .git/

[apply]
whitespace = nowarn
[rerere]
enabled = true
[merge]
stat = true

[color]
ui = auto
status = auto
branch = auto
[color "branch"]
current = yellow reverse
local = green
remote = cyan
plain = white
[color "diff"]
meta = yellow bold
frag = magenta bold
old = red bold
new = green bold
whitespace = red reverse
[color "status"]
added = cyan
changed = yellow
untracked = red
[color "decorate"]
branch = green
remoteBranch = cyan
tag = yellow
stash =yellow
HEAD = black yellow


[diff]
tool = Kaleidoscope
[difftool]
prompt = false
[difftool "Kaleidoscope"]
cmd = ksdiff-wrapper git \"$LOCAL\" \"$REMOTE\"


[branch]
autosetuprebase = always
[push]
default = simple
[branch "master"]
remote = origin
[remote "origin"]
push = master
push = +refs/tags/*:refs/tags/*
tagopt = --tags

[github]
user = rwoeber

[iwelt]
email = richard.woeber@iwelt.de
signingkey = D01A11F4
42 changes: 42 additions & 0 deletions tag-git/gitignore_global
@@ -0,0 +1,42 @@
#########
# OS X
#########
*~
._*
*.swp
*.lock
*.log
.swp
.DS_Store
.DS_Store?
profile
thumbs.db
Icon?
.Spotlight-V100
.Trashes

# Thumbnails
._*
# Files that might appear on external disk
.Spotlight-V100
.Trashes
# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk

# Ruby/Bundler-binstubs
.bin
.bundle

# Jetbrains
.idea


# Vim swap files
.*.sw?

# Pow and Powder config
/.pow*
35 changes: 35 additions & 0 deletions tag-git/gitk
@@ -0,0 +1,35 @@
set mainfont {Inconsolata 14}
set textfont {Inconsolata 14}
set uifont {"Inconsolata Bold" 12}
set tabstop 8
set findmergefiles 0
set maxgraphpct 50
set maxwidth 16
set cmitmode patch
set wrapcomment none
set autoselect 1
set showneartags 1
set hideremotes 0
set showlocalchanges 1
set datetimeformat {%Y-%m-%d %H:%M:%S}
set limitdiffs 1
set uicolor grey85
set want_ttk 1
set bgcolor white
set fgcolor black
set colors {green red blue magenta darkgrey brown orange}
set diffcolors {red "#00a000" blue}
set markbgcolor #e0e0ff
set diffcontext 3
set selectbgcolor gray85
set extdifftool opendiff
set perfile_attrs 0
set geometry(main) 1024x625+625+42
set geometry(state) normal
set geometry(topwidth) 1024
set geometry(topheight) 165
set geometry(pwsash0) "320 1"
set geometry(pwsash1) "480 1"
set geometry(botwidth) 400
set geometry(botheight) 455
set permviews {}

0 comments on commit df7bd48

Please sign in to comment.