m/dotfiles
1
0
Fork 0
mirror of https://github.com/kremalicious/dotfiles.git synced 2024-11-22 01:37:14 +01:00
Code Releases Activity

ghi stuff

Browse Source
This commit is contained in:
Matthias Kretschmann 2015-08-01 16:21:21 +02:00
parent 95acd46540
commit 8a849e7f94
2 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
gitconfig
View File

@ -8,68 +8,68 @@
# name = # name =
[github] [github]
user = kremalicious user = kremalicious
[credential] [credential]
helper = osxkeychain helper = osxkeychain
[core] [core]
excludesfile = ~/.gitignore excludesfile = ~/.gitignore
quotepath = false quotepath = false
# Handle umlauts and such better on OS X # Handle umlauts and such better on OS X
# for whatever crazy reason this explicitly # for whatever crazy reason this explicitly
# has to be set to false so tracked files with # has to be set to false so tracked files with
# special characters don't get treated as untracked # special characters don't get treated as untracked
precomposeunicode = false precomposeunicode = false
# Make `git rebase` safer on OS X # Make `git rebase` safer on OS X
# More info: http://www.git-tower.com/blog/make-git-rebase-safe-on-osx/ # More info: http://www.git-tower.com/blog/make-git-rebase-safe-on-osx/
trustctime = false trustctime = false
[alias] [alias]
# View abbreviated SHA, description, and history graph of the latest 20 commits # View abbreviated SHA, description, and history graph of the latest 20 commits
l = log --pretty=oneline -n 20 --graph --abbrev-commit l = log --pretty=oneline -n 20 --graph --abbrev-commit
ll = log --stat --abbrev-commit ll = log --stat --abbrev-commit
# View the current working tree status using the short format # View the current working tree status using the short format
s = status -s s = status -s
# Clone a repository including all submodules # Clone a repository including all submodules
c = clone --recursive c = clone --recursive
# Amend the currently staged files to the latest commit # Amend the currently staged files to the latest commit
amend = commit --amend --reuse-message=HEAD amend = commit --amend --reuse-message=HEAD
# Remove branches that have already been merged with master # Remove branches that have already been merged with master
# a.k.a. ‘delete merged’ # a.k.a. ‘delete merged’
dm = "!git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d" dm = "!git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d"
[fetch] [fetch]
prune = true prune = true
[push] [push]
default = current default = current
[color] [color]
diff = auto diff = auto
status = auto status = auto
branch = auto branch = auto
interactive = auto interactive = auto
ui = auto ui = auto
[color "branch"] [color "branch"]
current = green bold current = green bold
local = green local = green
remote = red bold remote = red bold
[color "diff"] [color "diff"]
meta = yellow bold meta = yellow bold
frag = magenta bold frag = magenta bold
old = red bold old = red bold
new = green bold new = green bold
[color "status"] [color "status"]
added = green bold added = green bold
changed = yellow bold changed = yellow bold
untracked = red untracked = red
# Set Kaleidoscope as diff and merge tool # Set Kaleidoscope as diff and merge tool
[diff] [diff]
@ -85,3 +85,6 @@
[mergetool "Kaleidoscope"] [mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true trustExitCode = true
[ghi]
token = !security find-internet-password -a kremalicious -s github.com -l 'ghi token' -w

2
ruby.sh
View File

@ -12,4 +12,4 @@ rvm use --default 2.2.2
rvm rubygems latest rvm rubygems latest
# Install gems # Install gems
gem install bundler jekyll gem install bundler jekyll ghi