Merge branch 'maint'
commite782e12f89955dfb0be82098af3cfdd8dd0eaf80
authorShawn O. Pearce <spearce@spearce.org>
Fri, 10 Oct 2008 15:39:20 +0000 (10 08:39 -0700)
committerShawn O. Pearce <spearce@spearce.org>
Fri, 10 Oct 2008 15:39:20 +0000 (10 08:39 -0700)
treebeaefcdcab01a967d65e5f7373d2a7997fda8335
parent23abd3f48cb217d1558fa1984bfa8c502717c08f
parentff74126c03a8dfd04e7533573a5c420f2a7112ac
Merge branch 'maint'

* maint:
  rebase -i: do not fail when there is no commit to cherry-pick
  test-lib: fix color reset in say_color()
  fix pread()'s short read in index-pack

Conflicts:
csum-file.c
csum-file.c
csum-file.h
index-pack.c
t/test-lib.sh