.bash_profile

# git bash completion
. /usr/local/git/contrib/completion/git-completion.bash

alias g="git status"

.gitconfig

[user]
        name = Carsten Brandt
        email = [email protected]
[alias]
        # more on https://git.wiki.kernel.org/index.php/Aliases
        st = status
        co = checkout
        ci = commit
        cia = commit -a
        br = branch
        brr = branch -a
        l  = log --pretty=format:\"%h %an  - %Cblue%d%Creset %s\"
        ll = log --pretty=format:\"%h %ad %an - %Cblue%d%Creset %s\" --graph --date=rfc
        lg = log --name-status --decorate=full --graph
        last = cat-file commit HEAD
        sm = submodule
        smu = submodule update
        noffmerge = merge --no-ff
        fetchall = fetch --all -p -t -v
# rnew is not realy what I wanted yet, so handle with care!
        rnew = log --name-status --decorate=full --graph master..origin/master
        lnew = log --name-status --decorate=full --graph ORIG_HEAD.. --stat
# find unmerged branches
        unmerged = branch --no-merged
[core]
        editor = /usr/bin/vi
        excludesfile = ~/.gitignore_global
#       always commit unix line endings (http://help.github.com/line-endings/)
        autocrlf = input
[color]
        diff = auto
        status = auto
        branch = auto
        interactive = auto
[merge]
        summary = true
[rebase]
        stat = true


[mergetool]
	keepBackup = true

.gitignore_global

# ~/.gitignore_global
#

# phpstorm ide files
.idea/*

# Mac stuff
.DS_Store

# bbedit project files
*.bbproject
*.bbprojectd

# ignore copied svn files
.svn/*