fix git/hooks/commit-msg for merge.
This commit is contained in:
@@ -32,7 +32,7 @@
|
|||||||
# 3. Move this file into your repository
|
# 3. Move this file into your repository
|
||||||
# $ mv commit-msg /path/to/repo/.git/hooks
|
# $ mv commit-msg /path/to/repo/.git/hooks
|
||||||
# $ chmod +x /path/to/repo/.git/hooks/commit-msg
|
# $ chmod +x /path/to/repo/.git/hooks/commit-msg
|
||||||
CHECK=$(cat $1 | aspell --lang=en_US list --add-extra-dicts=$HOME/.aspell.en_US.per)
|
CHECK=$(cat $1 | head -1 | aspell --lang=en_US list --add-extra-dicts=$HOME/.aspell.en_US.per)
|
||||||
#CHECK=$(cat $1 | hunspell -s -d en_US,${HOME}/devel/scripts/git/my_dictionary -l)
|
#CHECK=$(cat $1 | hunspell -s -d en_US,${HOME}/devel/scripts/git/my_dictionary -l)
|
||||||
if [ "${CHECK}" != "" ]; then
|
if [ "${CHECK}" != "" ]; then
|
||||||
echo "Spell Check Error:"
|
echo "Spell Check Error:"
|
||||||
|
|||||||
@@ -8,13 +8,9 @@
|
|||||||
#export http_proxy=devproxy.bloomberg.com:82
|
#export http_proxy=devproxy.bloomberg.com:82
|
||||||
#export https_proxy=devproxy.bloomberg.com:82
|
#export https_proxy=devproxy.bloomberg.com:82
|
||||||
|
|
||||||
if [[ "$(hostname)" == "lnxmqts01" ]]; then
|
#export DEV_CINC=-I.
|
||||||
export SKELETON_DEPLOY=$HOME/devel/bb/skeleton_internals
|
#export DEV_CPPINC=-I.
|
||||||
fi
|
#export DEV_FINC=-I.
|
||||||
|
|
||||||
export DEV_CINC=-I.
|
|
||||||
export DEV_CPPINC=-I.
|
|
||||||
export DEV_FINC=-I.
|
|
||||||
|
|
||||||
#I need this to run distributor locally.
|
#I need this to run distributor locally.
|
||||||
export PGPASSFILE=$HOME/.pgpass
|
export PGPASSFILE=$HOME/.pgpass
|
||||||
@@ -27,10 +23,8 @@ export BOOST_DIR=$SRC_DIR/boost
|
|||||||
#export TBB_LIB_DEBUG=$TBB_DIR/build/linux_intel64_gcc_cc4.8.2_libc2.12_kernel2.6.32_debug/
|
#export TBB_LIB_DEBUG=$TBB_DIR/build/linux_intel64_gcc_cc4.8.2_libc2.12_kernel2.6.32_debug/
|
||||||
export PIP_INDEX_URL=https://artprod.dev.bloomberg.com/artifactory/api/pypi/bloomberg-pypi/simple
|
export PIP_INDEX_URL=https://artprod.dev.bloomberg.com/artifactory/api/pypi/bloomberg-pypi/simple
|
||||||
|
|
||||||
alias bb='cd $HOME/devel/bb >/dev/null'
|
alias bb='cd $HOME/bb >/dev/null'
|
||||||
#complete -f -X '!*.mk' plink
|
complete -W "build clean build_all clean_all dpkg install default all" make
|
||||||
#complete -f -X '!*.mk' llcalc
|
|
||||||
#complete -W "build clean build_all clean_all skeleton_setup jenkins_update" make
|
|
||||||
|
|
||||||
stty sane # should normalize backspace issues?
|
stty sane # should normalize backspace issues?
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user