Skip to content
Browse files

Various small changes. Also, finally hardlinked this directory.

  • Loading branch information...
1 parent 2f7cf0b commit 72345cdfc49eeae4a4cbd9423b8532f513293082 @michaelficarra committed Jul 9, 2010
Showing with 8 additions and 5 deletions.
  1. +3 −1 .bashrc
  2. +5 −4 .gitconfig
  3. 0 .inputrc
View
4 .bashrc
@@ -8,12 +8,14 @@ fi
# path modifications
export PATH=$PATH:$HOME/bin
+for dir in $HOME/projects/*/bin; do
+ export PATH="$PATH:$dir"
+done
export CLASSPATH=.:/usr/java:/usr/lib
export JAVA_HOME=/usr/java/default
export ANT_HOME=/usr/share/ant
# shell behaviour
-#PROMPT_COMMAND='history -a && history -r'
CDPATH='.:~'
PS1='#\u@\h:\W\$ '
export EDITOR=vim
View
9 .gitconfig
@@ -12,6 +12,7 @@
diff = auto
status = auto
branch = auto
+ ui = auto
[diff]
renames = copy
[alias]
@@ -30,15 +31,15 @@
sm = submodule
smi = submodule init
smu = submodule update
- smiu = !git submodule init && git submodule update
+ smiu = submodule update --init
pom = push origin master
- amend = commit --amend -C HEAD
+ amend = commit --amend -c HEAD
tags = tag -n1 -l
stat = diff --stat
staged = diff --cached
graph = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
summary = log --oneline
changes = log --oneline --reverse
info = config --list
- edit-conflicted-files = !$EDITOR $(git ls-conflicted-files)
-
+ ls-conflicted-files = ls-files --unmerged
+ edit-conflicted-files = !$EDITOR $(git ls-conflicted-files | cut -f2)
View
0 .inputrc 100755 → 100644
File mode changed.

0 comments on commit 72345cd

Please sign in to comment.
Something went wrong with that request. Please try again.