Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/holman/dotfiles
Browse files Browse the repository at this point in the history
  • Loading branch information
holman committed May 31, 2013
2 parents 54a6bb5 + d79f4e0 commit dee1088
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
5 changes: 3 additions & 2 deletions README.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,9 @@ symlinked without extension into `$HOME` when you run `script/bootstrap`.
## what's inside

A lot of stuff. Seriously, a lot of stuff. Check them out in the file browser
above and see what components may mesh up with you. Fork it, remove what you
don't use, and build on what you do use.
above and see what components may mesh up with you.
[Fork it](https://github.com/holman/dotfiles/fork), remove what you don't
use, and build on what you do use.

## components

Expand Down
2 changes: 1 addition & 1 deletion bin/git-track
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
# `origin/$branch-name`.

branch=$(git rev-parse --abbrev-ref HEAD)
git branch --set-upstream $branch origin/$branch
git branch $branch --set-upstream-to origin/$branch
1 change: 1 addition & 0 deletions git/gitconfig.symlink.example
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
[user]
name = AUTHORNAME
email = AUTHOREMAIL
[credential]
helper = osxkeychain
[alias]
co = checkout
Expand Down
2 changes: 1 addition & 1 deletion script/bootstrap
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
#
# bootstrap installs things.

Expand Down

0 comments on commit dee1088

Please sign in to comment.