Skip to content

Commit

Permalink
settings
Browse files Browse the repository at this point in the history
  • Loading branch information
Bilalh committed Jan 12, 2012
1 parent 565a77f commit ec20148
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 8 deletions.
11 changes: 7 additions & 4 deletions .ackrc
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
#--type-set=music=.mp3,.m4a,.flac,.ac3,.ogg,.aiff,.m4b,.aac,.wav,.wmv,.ape,.mka
#--type-set=manga=.cbz,.cbr,.cba,cb7
--type-set=bak=.bak
--type-set=markdown=.md,.markdown,mdown
--type-add=java=.pde
--type-add=ruby=.haml,.rake,.rsel,.builder
--type-add=html=.html.erb,.html.haml
--type-add=js=.js.erb
--type-add=css=.sass,.less
--type-add=css=.sass,.scss,.less
--type-set=jasmin=.j
--type-set=cucumber=.feature
--type-set=music=.mp3,.m4a,.flac,.ac3,.ogg,.aiff,.m4b,.aac,.wav,.wmv,.ape,.mka
--type-set=manga=.cbz,.cbr,.cba,cb7
--type-set=tex-temp=.pdfsync,.log,.bbl,.aux,.blg,.synctex,.fdb,.out,.toc,.fdb_latexmk
--type-set=tex=.tex
--type-set=tex=.tex,.bib
--type-set=epub=.opf,.xhtml,.ncx,.css,.xml
--ignore-dir=vendor
--ignore-dir=log
Expand Down
2 changes: 2 additions & 0 deletions .bash_profile
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ PATH=$PATH:$HOME/Programming/Java/android-sdk-mac_x86/platform-tools
export PATH

export ANDROID_SDK=$HOME/Programming/Java/android-sdk-mac_x86
export RUBY_PLATFORM="darwin"
export R_HOME=/Library/Frameworks/R.framework/Resources

### aliases and other functions
[ -f ~/.bashrc ] && source ~/.bashrc
Expand Down
13 changes: 10 additions & 3 deletions .gitconfig
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[user]
name = Bilal Hussain
name = Bilal Syed Hussain
email = [email protected]
# email = [email protected]
[color]
ui = auto
[core]
excludesfile = /Users/bilalh/.gitignore
[alias]

b = branch
c = commit
d = describe
Expand All @@ -15,15 +15,16 @@
w = whatchanged
ca = commit -am
ch = checkout
cam = commit --amend -am
pom = push origin master
ldiff = difftool -t latex

# Logs
lg = log --graph --pretty=format:'%Cred%an%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --date=relative
ld = log --graph --pretty=format:'%Cred%an%Creset -%C(yellow)%d%Creset %s %Cgreen(%ai)%Creset'
lo = log --graph --pretty=format:'%Cred%h%Creset - %Cgreen(%cr) %C(bold blue)<%an>%Creset %s %C(yellow)%d%Creset ' --abbrev-commit --date=relative

# One line per commit
lo = log --graph --decorate --pretty=oneline --abbrev-commit
loa = log --graph --decorate --pretty=oneline --abbrev-commit --all

# commits not pushed to $1
Expand Down Expand Up @@ -52,11 +53,17 @@
# url of origin, about 99% of what I use git config --list for
cloneurl = config --get remote.origin.url

shorten = "!sh -c 'curl -i http://git.io -F url=$1' -"

[core]
pager = less -FRSX
quotepath = false
[apply]
whitespace = fix
[gist]
private = yes
browse = yes

[difftool.latex]
cmd = latexdiff $LOCAL $REMOTE
[difftool "Kaleidoscope"]
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ project.xcworkspace/
# Generated files
VersionX-revision.h


#Tex
*.aux
*.glo
*.idx
Expand Down Expand Up @@ -62,6 +62,7 @@ VersionX-revision.h
*.fdb_latexmk
*.log
*.watcher_pid
*.brf

*.DS_Store
*.o
Expand Down
13 changes: 13 additions & 0 deletions .inputrc
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,16 @@ set completion-ignore-case On

set meta-flag on
set input-meta on

# Be more intelligent when autocompleting by also looking at the text after
# # the cursor. For example, when the current line is "cd ~/src/mozil", and
# # the cursor is on the "z", pressing Tab will not autocomplete it to "cd
# # ~/src/mozillail", but to "cd ~/src/mozilla". (This is supported by the
# # Readline used by Bash 4.)
set skip-completed-text on

set input-meta on
set output-meta on
set convert-meta off


0 comments on commit ec20148

Please sign in to comment.