Sync with master.

.bashrc

@@ -201,7 +201,7 @@ __git_prompt_command() {
       REPO_TIMESTAMP="$(git config --local --get --type int script.AutoMergeLast)"
       (( ${!TIMESTAMP_VAR:-0} < REPO_TIMESTAMP )) && {
         # Display message depending on status.
-        if [[ "$(git config --local --get --type int script.AutoMergeSuccess)" == "true" ]]; then
+        if [[ "$(git config --local --get --type bool script.AutoMergeSuccess)" == "true" ]]; then
           printf "\\033[1;32m%s" "Git auto-merge succeeded for this repo."
           if [[ "${GIT_REPO_INFO[1]}" == "$HOME" ]]; then
             printf "  %s\\033[0m\\n" "Re-source .bash* files."

.gitconfig-tadgy@*

@@ -0,0 +1,29 @@
+[user]
+	name = Darren 'Tadgy' Austin
+	email = darren@afterdark.org.uk
+[color]
+	branch = auto
+	diff = auto
+	grep = auto
+	interactive = auto
+	showBranch = auto
+	status = auto
+	ui = auto
+[credential]
+	username = tadgy
+	helper = cache --timeout 2592000
+[commit]
+	verbose = 1
+[push]
+	autoSetupRemote = true
+[alias]
+	c = commit
+	co = checkout
+	d = diff
+	lsut = ls-files --others --exclude-standard --directory --error-unmatch -- ':/*'
+	p = push
+	s = status
+[init]
+	defaultBranch = master
+[maintenance]
+	repo = /home/tadgy