Skip to content
Browse files

Enable detailed summary of submodule conflicts.

  • Loading branch information...
1 parent 752c4ba commit d5d737f686a1dc4b226b1d862c124d8f8cc36dd1 @jpr5 jpr5 committed Dec 4, 2010
Showing with 3 additions and 1 deletion.
  1. +3 −1 .gitconfig
View
4 .gitconfig
@@ -42,7 +42,7 @@
email = jpr5@darkridge.com
[core]
excludesfile = ~/.gitignore-global
- whitespace=indent-with-no-tab,trailing-space,cr-at-eol
+ whitespace=trailing-space,cr-at-eol
[github]
user = jpr5
token = 4225723a97dc811c978bde1c1c54a23d
@@ -66,3 +66,5 @@
[rerere]
enabled = 1
autoupdate = 1
+[status]
+ submodulesummary = true

0 comments on commit d5d737f

Please sign in to comment.
Something went wrong with that request. Please try again.