]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 23abd3f ff74126)
Merge branch 'maint'
authorShawn O. Pearce <spearce@spearce.org>
Fri, 10 Oct 2008 15:39:20 +0000 (08:39 -0700)
committerShawn O. Pearce <spearce@spearce.org>
Fri, 10 Oct 2008 15:39:20 +0000 (08:39 -0700)
commite782e12f89955dfb0be82098af3cfdd8dd0eaf80
treebeaefcdcab01a967d65e5f7373d2a7997fda8335tree | snapshot
parent23abd3f48cb217d1558fa1984bfa8c502717c08fcommit | diff
parentff74126c03a8dfd04e7533573a5c420f2a7112accommit | diff
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 diff1 | diff2 | blob | history
csum-file.h diff1 | diff2 | blob | history
index-pack.c diff1 | diff2 | blob | history
t/test-lib.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.