• Shawn O. Pearce's avatar
    Merge branch 'maint' · e782e12f
    Shawn O. Pearce authored
    * 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
    e782e12f
csum-file.c 2.56 KB