diff options
| author |  Shawn O. Pearce <spearce@spearce.org> | 2008-10-10 08:39:20 -0700 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-10-10 08:39:20 -0700 |
| commit | e782e12f89955dfb0be82098af3cfdd8dd0eaf80 (patch) | |
| tree | beaefcdcab01a967d65e5f7373d2a7997fda8335 /t/t6033-merge-crlf.sh | |
| parent | Merge branch 'js/objc-funchdr' (diff) | |
| parent | rebase -i: do not fail when there is no commit to cherry-pick (diff) | |
| download | tgif-e782e12f89955dfb0be82098af3cfdd8dd0eaf80.tar.xz | |
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
Diffstat (limited to 't/t6033-merge-crlf.sh')
0 files changed, 0 insertions, 0 deletions