#git #configuration and #aliases

.gitconfig

[user]
        name = Your Name
	email = your@email.here
[color]
	status = auto
	branch = auto
	interactive = auto
	diff = auto
[alias]
        st = status -sb
        ci = commit
        co = checkout
        br = branch
        gpp = git pull --rebase && git push
        standup = log --since=yesterday --author="your@email.here" --all --pretty=format:'%Cred%h%Creset -%Creset %s %Cgreen(%cr) %C(yellow)%d%Creset %C(bold blue)<%an>%Creset'
        stddl = log --since='last friday' --author="your@email.here" --all --pretty=format:'%Cred%h%Creset -%Creset %s %Cgreen(%cr) %C(yellow)%d%Creset %C(bold blue)<%an>%Creset'
        stdbranques = log --since='yesterday' --author="your@email.here" --all --pretty=format:'%d'
        hores = log --since='1 week ago' --author="your@email.here" --all --pretty=format:'%Cred%h%Creset -%Creset %s %Cgreen(%cr) %C(yellow)%d%Creset %C(bold blue)<%an>%Creset'
        purr = pull --rebase
        lg = log --pretty=format:'%Cred%h%Creset -%Creset %s %Cgreen(%cr) %C(yellow)%d%Creset %C(bold blue)<%an>%Creset'
        nomerged = branch --no-merged
        merged = branch --merged
        me = log --author="your@email.here" --all --pretty=format:'%Cred%h%Creset -%Creset %s %Cgreen(%cr) %C(yellow)%d%Creset %C(bold blue)<%an>%Creset'
[core]
	editor = sublime-text
        excludesfile = ~/www/gitconfig/.gitignore-global
[merge]
	tool = meld

.gitignore-global

# Ignore OS specific files #
############################
.DS_Store
.directory
.DS_Store?
._*
.Spotlight-V100
.Trashes
ehthumbs.db
Thumbs.db

#Ignore KDE's backup files #
############################
*~
# Ignore editor specific files.
nbproject
*.kdev4
.idea #Jetbrain's Editors' configuration files

#Ignore Development modules #
#############################
sites/*/modules/development

# Ignore editor specific files #
################################
*nbproject
*.kdev4
>>>>>>> e975387df4ffba2d4be4f0da98662433f9547e77

# Ignore SASS cache #
#####################
.sass-cache
.sass-cache/*

<<<<<<< HEAD
#Sites specific configuration
/home/ccamara/www/ymbra/msf/docroot/sites/usa/themes/custom/msf_usa_zen/config.rb
../ymbra/msf/docroot/sites/usa/themes/custom/msf_usa_zen/config.rb
=======
# Compiled source #
###################
*.com
*.class
*.dll
*.exe
*.o
*.so

# Packages #
############
# it's better to unpack these files and commit the raw source
# git has its own built in compression methods
*.7z
*.dmg
*.gz
*.iso
*.jar
*.rar
*.tar
*.zip

# Logs and databases #
######################
*.log
*.sql
*.sqlite
>>>>>>> e975387df4ffba2d4be4f0da98662433f9547e77

README.md

This folder contains some common configuration for git such as

User information

Colors

Aliases

Ignored files

##Instructions

Symlink .gitconfig at home/ to .gitconfig file in this repo

cd ~
ln -s  ~/www/unix-setup/gitconfig/.gitconfig  ~/.gitconfig 

Symlink .gitignore-global at home/ (or any desired folder) pointing to .gitignore-global file in this repo

cd ~
ln -s  ~/www/unix-setup/gitconfig/.gitignore-global  ~/www/.gitignore-global 

Edit .gitconfig in order to type correct the following things:

path for .gitignore-global

username

email (find your@email.here and replace it with appropiate email)