]> asedeno.scripts.mit.edu Git - git.git/commitdiff
Merge branch 'maint'
authorJunio C Hamano <junkio@cox.net>
Mon, 19 Feb 2007 02:45:52 +0000 (18:45 -0800)
committerJunio C Hamano <junkio@cox.net>
Mon, 19 Feb 2007 02:45:52 +0000 (18:45 -0800)
* maint:
  GIT 1.5.0.1
  Documentation/i18n.txt: it is i18n.commitencoding not core.commitencoding
  Read the config in rev-list

Conflicts:

RelNotes


Trivial merge