changeset 401:4cbf9f8b4a37

SCM config tweaks.
author Ludovic Chabant <ludovic@chabant.com>
date Sun, 10 Dec 2017 21:42:47 -0800
parents d5f9ce3c3c91
children a7b50d960241
files git/gitconfig hgrc/hgignore
diffstat 2 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/git/gitconfig	Wed Aug 23 21:22:25 2017 -0700
+++ b/git/gitconfig	Sun Dec 10 21:42:47 2017 -0800
@@ -1,6 +1,6 @@
 [user]
-name = Ludovic Chabant
-email = ludovic@chabant.com
+	name = Ludovic Chabant
+	email = ludovic@chabant.com
 
 [push]
 default = simple
@@ -18,3 +18,7 @@
 [mergetool "sourcetree"]
 	cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
 	trustExitCode = true
+[core]
+	excludesfile = /Users/abdul/.gitignore_global
+[commit]
+	template = /Users/abdul/.stCommitMsg
--- a/hgrc/hgignore	Wed Aug 23 21:22:25 2017 -0700
+++ b/hgrc/hgignore	Sun Dec 10 21:42:47 2017 -0800
@@ -2,6 +2,7 @@
 
 *~
 *.pyo
+*.orig
 .DS_Store
 Thumbs.db