Update git settings

adamyonk · Jul 27, 2017 · 79bd8ae · 79bd8ae
1 parent ddfe617
commit 79bd8ae
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 15 deletions.
diff --git a/git/git_template.symlink/hooks/ctags b/git/git_template.symlink/hooks/ctags
diff --git a/git/git_template.symlink/hooks/post-checkout b/git/git_template.symlink/hooks/post-checkout
diff --git a/git/git_template.symlink/hooks/post-commit b/git/git_template.symlink/hooks/post-commit
diff --git a/git/git_template.symlink/hooks/post-merge b/git/git_template.symlink/hooks/post-merge
diff --git a/git/git_template.symlink/hooks/post-rewrite b/git/git_template.symlink/hooks/post-rewrite
diff --git a/git/gitconfig.symlink.example b/git/gitconfig.symlink.example
@@ -4,6 +4,7 @@
   co = checkout
   d = diff --color-words
   dlc = diff --cached HEAD^
+  dw = diff --color-words --word-diff -w
   f = fetch
   l = log --abbrev-commit --color --graph --pretty=format:"%Cred%h%Creset\\ -%C(yellow)%d%Creset\\ %s\\ %Cgreen(%cr)%C(bold\\ blue)\\ <%an>%Creset"
   m = merge
@@ -20,6 +21,7 @@
   subu = submodule foreach git pull origin master
   wci = watch-ci
   wip = "!$EDITOR $(git ls-files -m)"
+  who = blame
 
 [branch]
   autosetuprebase = always
@@ -48,13 +50,13 @@
   protocol = https
 
 [ghi]
-  token = GHI_TOKEN
+	token = !security find-internet-password -a adamyonk -s github.com -l 'ghi token' -w
 
 [github]
   user = GITHUB_USERNAME
 
 [gpg]
-  program = gpg1
+  program = gpg
 
 [help]
   autocorrect = 1