From: Richard Hartmann <richih@debian.org>
Date: Fri, 21 Feb 2014 20:35:54 +0000 (+0100)
Subject: Merge branch 'master' of github.com:RichiH/vcsh
X-Git-Url: https://git.madduck.net/code/vcsh.git/commitdiff_plain/e646aff7f580fd0de1ca659b4f3313b3a26c87e2?ds=inline;hp=-c

Merge branch 'master' of github.com:RichiH/vcsh
---

e646aff7f580fd0de1ca659b4f3313b3a26c87e2
diff --combined vcsh
index 2f40a75,aa97b63..18b9380
--- a/vcsh
+++ b/vcsh
@@@ -74,7 -74,7 +74,7 @@@ f
  
  # 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}
@@@ -334,7 -334,7 +334,7 @@@ upgrade() 
  		git config core.worktree "$VCSH_BASE"
  	fi
  	[ ! "x$VCSH_GITIGNORE" = 'xnone' ] && git config core.excludesfile ".gitignore.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"
  	hook post-upgrade