projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
[feisty_meow.git]
/
scripts
/
rev_control
/
version_control.sh
diff --git
a/scripts/rev_control/version_control.sh
b/scripts/rev_control/version_control.sh
index 282dd4d922ff3bd9aa2708bbd34cca9760b679aa..703e003ddf52269c1215b5a9db6cbe59f784cff6 100644
(file)
--- 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.
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 "$(which
able splitter
)" ]; then
+ TO_SPLITTER="$(which
able
splitter)"
# calculate the number of columsn in the terminal.
cols=$(get_maxcols)
TO_SPLITTER+=" --maxcol $(($cols - 1))"
# 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
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 .
exit_on_error "git diff"
elif [ -d "CVS" ]; then
cvs diff .