Merge branch 'jk/maint-config-multi-order'
commite70aee5c86c508af4a92bd02b688b4aa39c58180
authorJunio C Hamano <gitster@pobox.com>
Fri, 12 Jul 2013 19:04:04 +0000 (12 12:04 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 12 Jul 2013 19:04:04 +0000 (12 12:04 -0700)
tree6b86714969391b91945fd82a120744fc5cfe1f9d
parent8a6482227ca31bd582aecbd211b85ff76595d0a7
parent7da9800fff189b93b46bb5e8763b75101264d940
Merge branch 'jk/maint-config-multi-order'

* jk/maint-config-multi-order:
  git-config(1): clarify precedence of multiple values
Documentation/git-config.txt