Permalink
Browse files

Add git l,lp,lg ; Add LC_CTYPE

  • Loading branch information...
1 parent a31dcfc commit 746d02046112f7fa1c856527934b853405a25b6d @fxposter committed Jul 14, 2012
Showing with 12 additions and 3 deletions.
  1. +3 −1 bash_profile
  2. +5 −1 gitconfig
  3. +4 −1 gitignore
View
@@ -1,7 +1,9 @@
export LANG=ru_RU.UTF-8
+export LC_CTYPE=ru_RU.UTF-8
#export PATH=./bin:~/bin:/usr/local/bin:/usr/local/sbin:/usr/local/share/python:$PATH:~/dev/android/tools:~/dev/android/platform-tools:/usr/X11/bin
-export PATH=~/bin:/usr/local/bin:/usr/local/sbin:$PATH
+export PATH=~/bin:/usr/local/bin:/usr/local/sbin:$PATH:~/.rvm/bin
export EDITOR=vim
+export ANDROID_SDK_ROOT=/usr/local/Cellar/android-sdk/r18
source ~/.bash/completion
source ~/.bash/git
View
@@ -17,7 +17,11 @@
prompt = false
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
- path =
+ path =
[mergetool "sourcetree"]
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true
+[alias]
+ lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --
+ l = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --
+ lp = log -p --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --
View
@@ -1,2 +1,5 @@
.idea
-
+*.sublime-project
+*.sublime-workspace
+.tags
+.tags_sorted_by_file

0 comments on commit 746d020

Please sign in to comment.