Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

polishing up

  • Loading branch information...
commit 26c3361521b6284b289cc78097d7fe0815790c33 1 parent 967ea8a
@sekati authored
Showing with 15 additions and 14 deletions.
  1. +4 −4 Rakefile
  2. +1 −0  bashrc
  3. +6 −7 gitconfig
  4. +4 −3 gitsecrets → gituser
View
8 Rakefile
@@ -4,7 +4,7 @@ desc "Hook our dotfiles into system-standard positions."
task :install => :submodules do
# this has all the linkables from this directory.
linkables = []
- linkables += Dir.glob('{gitconfig,gitignore,gitsecrets}') if want_to_install?('git')
+ linkables += Dir.glob('{gitconfig,gitignore,gituser}') if want_to_install?('git')
linkables += Dir.glob('{vim,vimrc}') if want_to_install?('vim')
linkables += Dir.glob('{bash,bashrc,profile}') if want_to_install?('bash')
linkables += Dir.glob('screenrc') if want_to_install?('screen')
@@ -35,10 +35,10 @@ task :install => :submodules do
when 'S' then skip_all = true
end
end
- #FileUtils.rm_rf(target) if overwrite || overwrite_all
- #{}`mv "$HOME/.#{file}" "$HOME/.#{file}.backup"` if backup || backup_all
+ FileUtils.rm_rf(target) if overwrite || overwrite_all
+ {}`mv "$HOME/.#{file}" "$HOME/.#{file}.backup"` if backup || backup_all
end
- #{}`ln -s "#{source}" "#{target}"`
+ `ln -s "#{source}" "#{target}"`
end
success_msg("installed")
end
View
1  bashrc
@@ -2,6 +2,7 @@ source ~/.bash/aliases
source ~/.bash/completions
source ~/.bash/paths
source ~/.bash/config
+source ~/.gituser
# use .localrc for settings specific to one system
if [ -f ~/.localrc ]; then
View
13 gitconfig
@@ -1,14 +1,12 @@
[user]
- name = Jason Horwitz
- email = jason@sekati.com
+ name = John Doe
+ email = you@example.com
[github]
- user = sekati
- token = 12345678901234567890123456789012
- ; the 'hub' command pulls from $GITHUB_TOKEN
- ; don't set it here, break anything that requires it to here
- ; and the complain to the maker of said thing that they suck
+ ; user = sekati
; token = !sh -c 'echo $GITHUB_TOKEN'
+ ; token = 12345678901234567890123456789012
+ ; WARNING: The 'hub' command pulls $GITHUB_TOKEN env variable (@see ~/.gituser)
[core]
excludesfile = ~/.gitignore
@@ -111,6 +109,7 @@
ci = commit # commit
c = commit -m # commit with message
ca = commit -am # commit all with message
+ cq = commit -a --allow-empty-message -m '' . # commit all quick with no message
amend = commit --amend # amend your last commit
#amend = commit --amend -C HEAD # amend to the last commit
fix = commit -am "fix" # "fix" commit
View
7 gitsecrets → gituser
@@ -1,11 +1,12 @@
-# @see http://loupgaroublond.blogspot.com/2008/09/keeping-private-config-files-private-in.html
+# Storing these env variables keeps them out of gitconfig.
+# @see http://help.github.com/set-your-user-name-email-and-github-token/
-# Set your git user info
+# Git user info
export GIT_AUTHOR_NAME='Your Name'
export GIT_AUTHOR_EMAIL='you@example.com'
export GIT_COMMITTER_NAME='Your Name'
export GIT_COMMITTER_EMAIL='you@example.com'
-# Optionally, set your GitHub credentials
+# GitHub credentials (optional)
export GITHUB_USER='your_user_name'
export GITHUB_TOKEN='your_github_token'
Please sign in to comment.
Something went wrong with that request. Please try again.