My lovely dotfiles

Setup

mkdir -p ~/Devel/config
cd ~/Devel/config
git clone <url>

Move commits to master:

# first HEAD~ arg should be last commit to keep in place, to -1 of commits to move
git rebase --onto master HEAD~ HEAD
git checkout -b to_merge
git checkout master
git merge to_merge
git branch -d to_merge
git checkout home
git rebase master

Push master:

# sanity check I didn't move over anything sensitive
git diff origin/master master
git push origin master && git push github master

Sync branch with origin:

git fetch origin master:master

Add new dot directory

dirName=<name>
mkdir "dot-$dirName"
ln -s "dot-$dirName" ".$dirName"
echo "dot-$dirName" >> .stow-local-ignore