summary refs log tree commit diff stats
path: root/gitconfig
diff options
context:
space:
mode:
authorAlan Pearce2013-08-28 09:13:53 +0100
committerAlan Pearce2013-08-28 09:13:53 +0100
commitc57093f28708a30b9720221532db80a9446bba77 (patch)
tree4d5fb8748463169cab6dcf2d592b755027ab75ab /gitconfig
parentb064712dfa6f4a3e727ad18568fc9f852c3e2c0d (diff)
parent314c9708d77bf367b775bf71be374faa690bcb1f (diff)
downloaddotfiles-c57093f28708a30b9720221532db80a9446bba77.tar.lz
dotfiles-c57093f28708a30b9720221532db80a9446bba77.tar.zst
dotfiles-c57093f28708a30b9720221532db80a9446bba77.zip
Merge remote-tracking branch 'refs/remotes/origin/master'
Diffstat (limited to 'gitconfig')
-rw-r--r--gitconfig4
1 files changed, 3 insertions, 1 deletions
diff --git a/gitconfig b/gitconfig
index 74d13ec..0e4d5af 100644
--- a/gitconfig
+++ b/gitconfig
@@ -18,4 +18,6 @@
 	standup = log --pretty=format:'%Cred%h%Creset -%Creset %s %Cgreen(%ci) %C(bold blue)<%an>%Creset' --since yesterday --author alan
 	ignored = ls-files --others -i --exclude-standard
 [github]
-	user = alan@alanpearce.co.uk
\ No newline at end of file
+	user = alan@alanpearce.co.uk
+[diff]
+	algorithm = patience