Merge branch 'master' into dev

This commit is contained in:
Fakerr 2017-02-10 07:16:40 +01:00
commit 84a6da7f3a
2 changed files with 4 additions and 4 deletions

View file

@ -23,7 +23,7 @@ GIT_FORMAT=""
GIT_LOG=""
COMMITS=""
LESSKEY=false
VERSION="1.1.3"
VERSION="1.1.4"
# Are we in a git repo?
if [[ ! -d ".git" ]] && ! git rev-parse --git-dir &>/dev/null; then
@ -181,9 +181,9 @@ function print_diff() {
if [[ $(( TN + DIFF_LINES_NUMBER )) -ge $(( `tput lines` - 1 )) ]]; then
if [[ $LESSKEY = true ]]; then
echo "$REVERSE ${COMMITS[$CP - 1]}\n\n $DIFF" | less -r -k $HOME/.lsh_less_keys_tmp
echo "$DIFF" | less -r -k $HOME/.lsh_less_keys_tmp
else
echo "$REVERSE ${COMMITS[$CP - 1]}\n\n $DIFF" | less -r
echo "$DIFF" | less -r
fi
else
stop=false

View file

@ -1,6 +1,6 @@
{
"name": "git-recall",
"version": "1.1.3",
"version": "1.1.4",
"description": "Simple and convenient Git tool to easily recall what you've done",
"main": "",
"scripts": {