Merge branch 'master' into nextjk_FreeBSD-6.1-RELEASE-p17-jc1_spearce_next_KNOWN_BUILDINGjk_FreeBSD-6.1-RELEASE-p17-jc1_spearce_next_KNOWN_PASSING
| commit | 59fa51c326296cbe2e348d22875706ca4d6bb61f | |
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Fri, 10 Oct 2008 15:39:31 +0000 (10 08:39 -0700) | ||
| committer | Shawn O. Pearce <spearce@spearce.org> | |
| Fri, 10 Oct 2008 15:39:31 +0000 (10 08:39 -0700) | ||
| tree | d95fbc696790295e648e2c26acbbe27ab5b0f172 | treesnapshot (tar.gz zip) |
| parent | 8544f196ed9e0e7bd7e66564f2d76485303dd995 | commitdiff |
| parent | e782e12f89955dfb0be82098af3cfdd8dd0eaf80 | commitdiff |
Merge branch 'master' into next
* master:
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
* master:
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
| git-rebase--interactive.sh | diff1 | diff2 | blobhistory |