From: Richard Hartmann Date: Fri, 21 Feb 2014 22:41:29 +0000 (+0100) Subject: Merge branch 'feature/gitattributes' X-Git-Url: https://git.madduck.net/code/vcsh.git/commitdiff_plain/a7ec1feb5aaa690f1360f8c4f91d670bb3787752?hp=3c2288b6e459e70c0601afaca67b6c32b497b3ac Merge branch 'feature/gitattributes' Conflicts: vcsh --- diff --git a/vcsh b/vcsh index a6653fc..418f78a 100755 --- a/vcsh +++ b/vcsh @@ -74,7 +74,7 @@ fi # Read defaults : ${VCSH_REPO_D:=$XDG_CONFIG_HOME/vcsh/repo.d} -: ${VCSH_HOOK_D:=$XDH_CONFIG_HOME/vcsh/hooks-enabled} +: ${VCSH_HOOK_D:=$XDG_CONFIG_HOME/vcsh/hooks-enabled} : ${VCSH_BASE:=$HOME} : ${VCSH_GITIGNORE:=exact} : ${VCSH_WORKTREE:=absolute} @@ -335,7 +335,7 @@ upgrade() { fi [ ! "x$VCSH_GITIGNORE" = 'xnone' ] && git config core.excludesfile ".gitignore.d/$VCSH_REPO_NAME" git config core.attributesfile ".gitattributes.d/$VCSH_REPO_NAME" - git config vcsh.vcsh 'true' + git config vcsh.vcsh 'true' use [ -e "$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME" ] && git add -f "$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME" [ -e "$VCSH_BASE/.gitattributes.d/$VCSH_REPO_NAME" ] && git add -f "$VCSH_BASE/.gitattributes.d/$VCSH_REPO_NAME"