parchlinux global dotfiles

Find a file

Dan Croak f893537686 Add basic git aliases * Fast commits. * Fast rebase of origin into feature branch. * Fast merge feature branch into master. * Fast branch creation. * Fast branch deletion. Conflicts: gitconfig		2012-10-08 20:30:29 -07:00
vim	switch to github vim color scheme	2011-12-04 14:51:53 -05:00
zsh/completion	Tab-complete ack by looking at the tags file	2012-09-27 08:28:13 -04:00
.gitignore	Add basic git aliases	2012-10-08 20:30:29 -07:00
ackrc	Add .ackrc	2012-09-15 13:59:19 -07:00
aliases	Improve Rails-related aliases	2012-09-15 12:07:10 -07:00
gitconfig	Add basic git aliases	2012-10-08 20:30:29 -07:00
gvimrc	Vim configuration	2011-01-13 17:54:08 -05:00
install.sh	Now posix compatible and I have removed the use of tail -r	2011-10-15 18:33:17 +11:00
LICENSE	Update README and add MIT-LICENSE	2012-09-18 23:10:20 -07:00
README.md	Update README and add MIT-LICENSE	2012-09-18 23:10:20 -07:00
tmux.conf	Set tmux to use reattach-to-user-namespace	2012-09-25 22:06:48 -07:00
vimrc	Tell vim to not create swap files	2012-09-22 19:32:22 -07:00
zlogin	zsh config	2011-01-13 17:26:04 -05:00
zshrc	add in zshkit fun stuff	2011-04-04 10:27:03 -04:00

README.md

thoughtbot dotfiles

Install

First, fork this repo on Github.

Then, clone your Github fork (replace "your-github-name" with your Github name) onto your laptop and install it:

git clone git@github.com:your-github-name/dotfiles.git
cd dotfiles
./install.sh

This will create symlinks for all config files in your home directory. You can safely run this file multiple times to update.

There is configuration for zsh so switch your shell from the default bash to zsh on OS X:

chsh -s /bin/zsh

Why fork?

dotfiles are fairly personal. You should be able to modify your dotfiles, and save them in version control in your fork.

However, the thoughtbot folks are often tweaking these dotfiles and you want to be able to get those updates.

So, your master branch is meant for your customizations and use the upstream branch to get thoughtbot's updates.

Set up the upstream branch

You only have to do this once:

git remote add upstream git@github.com:thoughtbot/dotfiles.git
git fetch upstream
git checkout -b upstream upstream/master

Update thoughtbot's changes into your customizations

You will want to customize your environment. We suggest making changes in files that are not in thoughtbot's files.

For example, to customize your zsh config, make your changes in ~/.zshenv:

# RVM
[[ -s '/Users/croaky/.rvm/scripts/rvm' ]] && source '/Users/croaky/.rvm/scripts/rvm'

# recommended by brew doctor
export PATH="/usr/local/bin:/usr/local/sbin:$PATH"

Commit those kinds of things in your master branch.

Then, each time you want to update thoughtbot's changes.

git checkout upstream
git pull
git checkout master
git rebase upstream

Credits

dotfiles are maintained and funded by thoughtbot, inc

Thank you to all the contributors!

The names and logos for thoughtbot are trademarks of thoughtbot, inc.