delta/libgit2.git, branch rb/timer-typo github.com: libgit2/libgit2.git Fix typo in timer normalization constants 2014-08-05T22:06:45+00:00 Russell Belfer rb@github.com 2014-08-05T22:06:45+00:00 3822d2cc4f4a171fdcf8dcfa7c7338b889c43c61 The effect of this would be that various update callbacks would not be made at the correct interval. 
The effect of this would be that various update callbacks would
not be made at the correct interval.
Merge pull request #2487 from libgit2/cmn/revwalk-no-prealloc 2014-07-25T09:27:51+00:00 Vicent Marti vicent@github.com 2014-07-25T09:27:51+00:00 59e3f45b6150984e6a74ce79062caa459eda369f Work around strict aliasing in array growth 
Work around strict aliasing in array growth
 array: mark the array to grow as volatile 2014-07-25T06:25:41+00:00 Carlos Martín Nieto cmn@dwim.me 2014-07-25T06:25:41+00:00 b62a6a13b2f9a40e6ea4bf7bc2a9255429fb0bd6 This works around strict aliasing rules letting some versions of GCC (particularly on RHEL 6) thinking that they can skip updating the size of the array when calculating the next element's offset. 
This works around strict aliasing rules letting some versions of
GCC (particularly on RHEL 6) thinking that they can skip updating the
size of the array when calculating the next element's offset.
revwalk: remove preallocation of the uninteresting commits 2014-07-24T15:52:28+00:00 Carlos Martín Nieto cmn@dwim.me 2014-07-24T14:46:59+00:00 9746b36cf9a86ba50a666bbc8cc97a37221cb954 Preallocating two commits doesn't make much sense as leaving allocation to the first array usage will allocate a sensible size with room for growth. This preallocation has also been hiding issues with strict aliasing in the tests, as we have fairly simple histories and never trigger the growth. 
Preallocating two commits doesn't make much sense as leaving allocation
to the first array usage will allocate a sensible size with room for
growth.

This preallocation has also been hiding issues with strict aliasing in
the tests, as we have fairly simple histories and never trigger the
growth.
Merge pull request #2477 from ethomson/merge 2014-07-23T07:41:52+00:00 Vicent Marti vicent@github.com 2014-07-23T07:41:52+00:00 9de6ec52008e3f30a4e8a5c6a13859eefcf86f57 Don't allow conflicts by default 
Don't allow conflicts by default
 Merge pull request #2484 from libgit2/fix-git-status-list-new-unreadable-folder 2014-07-23T05:57:20+00:00 Vicent Marti vicent@github.com 2014-07-23T05:57:20+00:00 243db06ce3ab5ac984e24867815add6251819561 Fix git status list new unreadable folder 
Fix git status list new unreadable folder
 undo indentation change in diff_print.c 2014-07-23T02:17:02+00:00 Alan Rogers alan@github.com 2014-07-23T02:17:02+00:00 85b7268e387eafce2e5cf53a671e6658ae82d6f0 






Merge pull request #2485 from ethomson/cherrypick
2014-07-22T18:30:26+00:00

Vicent Marti
vicent@github.com

2014-07-22T18:30:26+00:00

bf9a7e0607b21bb09c4b69913b84fe295d4f5b18

Rename git_cherry_pick to git_cherrypick




Rename git_cherry_pick to git_cherrypick






git_cherry_pick -> git_cherrypick
2014-07-22T14:40:23+00:00

Edward Thomson
ethomson@edwardthomson.com

2014-07-22T14:40:23+00:00

0ba4dca52625b54d6b741bd10dce5ef76ebbf1b8












Merge remote-tracking branch 'origin/master' into fix-git-status-list-new-unreadable-folder
2014-07-22T05:08:24+00:00

Alan Rogers
alan@github.com

2014-07-22T05:08:24+00:00

7d0ab0fae04015e0bc66ff16beae495f13969b10