Merge branch 'CJ-Systems:develop' into develop

Author: ChrisJStone

git-flow

@@ -46,7 +46,7 @@ fi
 # git-flow file is a symbolic link
 case $(uname -s) in
 Linux)
-	export GITFLOW_DIR=$(dirname "$(readlink -e "$0")")
+	export GITFLOW_DIR=$(dirname "$(readlink -f "$0")")
 	;;
 FreeBSD|OpenBSD|NetBSD)
 	export FLAGS_GETOPT_CMD='/usr/local/bin/getopt'

git-flow-log

@@ -48,7 +48,7 @@ usage() {
 	OPTIONS_SPEC="\
 git flow log
 
-shows current branch log compared to develop
+shows current branch log compared to base branch
 'git help log' for arguments
 --
 "
@@ -69,7 +69,7 @@ cmd_list() {
 	OPTIONS_SPEC="\
 git flow feature log [<options>]
 
-Show log on <feature> branch since the fork of <develop> branch
+Show log on current branch since the fork of base branch
 Options come from git log
 --
 h,help!         Show this help