]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e62a641 a0cf49c)
Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 Feb 2008 22:20:15 +0000 (14:20 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Feb 2008 22:20:15 +0000 (14:20 -0800)
* maint:
  Fix parsing numeric color values
  INSTALL: git-merge no longer uses cpio


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.