.gitconfig

@@ -2,7 +2,7 @@
 	lg = log --color --graph --pretty=format:'%Cred%h%Creset %Cgreen(%cr)%Creset %C(bold blue)%an%Creset%C(yellow)%d%Creset %s' --abbrev-commit
 	old-branches = for-each-ref refs/remotes/origin/ --sort=committerdate --format='%(HEAD) %(color:yellow)%(refname:short)%(color:reset) %(color:blue)%(authorname)%(color:reset) (%(color:green)%(committerdate:relative)%(color:reset))'
 	release-count = !git releases | cut -f 3 | sort | uniq -c | sort -n -r
-	releases = !git log --date=local --decorate=full --all --pretty=format:'%Cgreen%ai%Creset\t%Cred%h%Creset\t%Cblue%cn%Creset\t%d\t%s' --abbrev-commit | grep -E 'release:? v?[0-9]+\\.[0-9]+\\.[0-9]+' | perl -p -e 's%\\(.*?tag: .+?\\)\\s*release(:\\s*)?%%' | sort -i
+	releases = !git log --date=local --decorate=full --all --pretty=format:'%Cgreen%ai%Creset\t%Cred%h%Creset\t%Cblue%cn%Creset\t%d\t%s' --abbrev-commit | grep -E 'release:? v?[0-9]+\\.[0-9]+\\.[0-9]+(:| -)' | perl -p -e 's%\\(.*?tag: .+?\\)\\s*release(:\\s*)?%%' | sort -i
 	stat = status -sb
 	tags = !git log --decorate=full --all --pretty=format:'%ai %d %s' --abbrev-commit | grep 'refs/tags' | sed -E 's/\\(tag:.+\\)[[:space:]]//'
 [color]
@@ -25,11 +25,8 @@
 [push]
 	default = upstream
 [merge]
-    hideResolved = true
-    tool = meld --auto-merge --output="$MERGED" "$LOCAL" "$BASE" "$REMOTE"
+	tool = meld
 [mergetool]
 	keepBackup = false
 [core]
-    pager = diff-so-fancy | less -x4 -RFX
-#[diff]
-#    external = difft --display=inline --tab-width=4
+	pager = diff-so-fancy | less -x4 -RFX