Code

Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Fri, 10 Sep 2010 16:39:08 +0000 (09:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 10 Sep 2010 16:39:08 +0000 (09:39 -0700)
commit9ab5a338fc03d5ea5c3ad4cd56e04029cd863c83
treeb9b4fc57306b099098838c4889e49540f03bf9ae
parent99f55ebc6757ec8777627142e7f8e1dc50f68d2c
parent9904fadfea002edf2ef22e8ec9a978e45d1f540b
Merge branch 'maint'

* maint:
  config.txt: fix placement of diff.noprefix
Documentation/config.txt