Merge branch 'maint't/extra-actions/extra-actionst/forks/sort-refactort/misc/quot-hext/summary/css-metadata
| commit | e782e12f89955dfb0be82098af3cfdd8dd0eaf80 | |
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Fri, 10 Oct 2008 15:39:20 +0000 (10 08:39 -0700) | ||
| committer | Shawn O. Pearce <spearce@spearce.org> | |
| Fri, 10 Oct 2008 15:39:20 +0000 (10 08:39 -0700) | ||
| tree | beaefcdcab01a967d65e5f7373d2a7997fda8335 | treesnapshot (tar.gz zip) |
| parent | 23abd3f48cb217d1558fa1984bfa8c502717c08f | commitdiff |
| parent | ff74126c03a8dfd04e7533573a5c420f2a7112ac | commitdiff |
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
* 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 | diff1 | diff2 | blobhistory |
| csum-file.h | diff1 | diff2 | blobhistory |
| index-pack.c | diff1 | diff2 | blobhistory |
| t/test-lib.sh | diff1 | diff2 | blobhistory |