X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Frev_control%2Fversion_control.sh;h=703e003ddf52269c1215b5a9db6cbe59f784cff6;hb=cf89d0dceba5a7ea91050e4b835f32b29633d706;hp=282dd4d922ff3bd9aa2708bbd34cca9760b679aa;hpb=34d1cb2e8687b826357db1d3821bf9e05cf6f13d;p=feisty_meow.git diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh index 282dd4d9..703e003d 100644 --- a/scripts/rev_control/version_control.sh +++ b/scripts/rev_control/version_control.sh @@ -15,8 +15,8 @@ source "$FEISTY_MEOW_SCRIPTS/tty/terminal_titler.sh" export MAX_DEPTH=5 # use our splitter tool for lengthy output if it's available. -if [ ! -z "$(which splitter 2>/dev/null)" ]; then - TO_SPLITTER="$(which splitter)" +if [ ! -z "$(whichable splitter)" ]; then + TO_SPLITTER="$(whichable splitter)" # calculate the number of columsn in the terminal. cols=$(get_maxcols) TO_SPLITTER+=" --maxcol $(($cols - 1))" @@ -156,7 +156,7 @@ function do_revctrl_diff svn diff . exit_on_error "subversion diff" elif [ -d ".git" ]; then - git diff + git --no-pager diff exit_on_error "git diff" elif [ -d "CVS" ]; then cvs diff .