Permalink
Browse files

Merge remote-tracking branch 'jack/master'

  • Loading branch information...
2 parents f1b330e + b288641 commit edcf8481f77b99566d123ad1c5cf2a4bae0c80f3 @fmoo committed Apr 20, 2012
Showing with 17 additions and 5 deletions.
  1. +9 −4 bashrc
  2. +1 −1 bin/colorize_git_blame_pipe.sh
  3. +5 −0 bin/git-mybase
  4. +2 −0 bin/git-summary
View
13 bashrc
@@ -56,10 +56,10 @@
# Source global definitions
GLOBAL_BASH_DEF='/etc/bashrc'
-if [ -f $GLOBAL_BASH_DEF ]
-then
- source $GLOBAL_BASH_DEF
-fi;
+#if [ -f $GLOBAL_BASH_DEF ]
+#then
+# source $GLOBAL_BASH_DEF
+#fi;
# Create a scrubed hostname
export HOSTNAME_SCRUB=`hostname | sed -e s/[^a-z0-9_]//g`
@@ -274,6 +274,11 @@ function myip () {
fi;
}
+function dumptcp() {
+ # TCPDUMP all the data on port $1 into rotated files /tmp/results. Note,
+ # this can get VERY large
+ sudo /usr/sbin/tcpdump -i any -s0 tcp port $1 -A -w /tmp/results -C 100
+}
# anyvi <file>
# run EDITOR on a script no matter where it is
@@ -1,2 +1,2 @@
#!/bin/bash
-git blame $@ | colorize_git_blame.pl | less -R
+git blame -wMC $@ | colorize_git_blame.pl | less -R
View
@@ -2,6 +2,11 @@
# A pretty looking git-svn-rebase that is way better than the default
# TODO: Make this work for non-SVN repositories
+GROUP_VERSION="$HOME/.bash/group/bin/git-mybase"
+if [ -f $GROUP_VERSION ]; then
+ source $GROUP_VERSION
+ exit
+fi;
SVN_REF=`git config svn-remote.svn.fetch | sed s/.*://`
OLD_SVN=`git rev-parse $SVN_REF`
CUR_BRANCH=`git status | grep -P '^# On branch' | sed 's/# On branch //'`
View
@@ -0,0 +1,2 @@
+#!/bin/bash
+git log --format="%h%x00%cr%x00%an%x00%s%x00" . | ruby -nae '$a=$_.split("\00");printf("%8s \033[34m\%23s\033[0m\ \033[33m\%12s\033[0m\ %s\n", $a[0], $a[1], $a[2], $a[3])'

0 comments on commit edcf848

Please sign in to comment.