summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix remaining init_options inconsistenciesrb/diff-update-index-stat-cacheRussell Belfer2014-04-3019-131/+74
* Make init_options fns use unsigned ints and macroRussell Belfer2014-04-3014-137/+100
* Remove trace / add git_diff_perfdata struct + apiRussell Belfer2014-04-2916-251/+220
* Get rid of redundant git_diff_options_init fnRussell Belfer2014-04-294-33/+2
* Add payloads, bitmaps to trace APIRussell Belfer2014-04-2910-104/+122
* Don't use trace if GIT_TRACE not definedRussell Belfer2014-04-282-0/+14
* Add GIT_STATUS_OPT_UPDATE_INDEX and use trace APIRussell Belfer2014-04-2810-68/+171
* Add diff option to update index stat cacheRussell Belfer2014-04-285-6/+128
* Lay groundwork for updating stat cache in diffRussell Belfer2014-04-285-22/+37
* Skip diff oid calc when size definitely changedRussell Belfer2014-04-284-8/+19
* Add build option for diff internal statisticsRussell Belfer2014-04-2810-48/+96
* Merge pull request #2306 from odcinek/development_cmakeVicent Marti2014-04-281-1/+1
|\
| * Make the build CMake 2.6 compatibleMarcin Sawicki2014-04-281-1/+1
|/
* Merge pull request #2301 from libgit2/cmn/pack-objects-memoryVicent Marti2014-04-272-1/+2
|\
| * pack-objects: always write out the status in write_one()cmn/pack-objects-memoryCarlos Martín Nieto2014-04-261-0/+1
| * zstream: grow based on used memory rather than allocatedCarlos Martín Nieto2014-04-261-1/+1
|/
* refdb: fix typo and wordingCarlos Martín Nieto2014-04-261-1/+1
* Merge pull request #2299 from mekishizufu/fix_leaksVicent Marti2014-04-252-8/+6
|\
| * Reset tests: Use sandboxed indexJiri Pospisil2014-04-251-6/+3
| * Filter: Make sure to release local on errorJiri Pospisil2014-04-251-2/+3
|/
* Merge pull request #2284 from jacquesg/push-progress-callbackVicent Marti2014-04-2520-121/+182
|\
| * Verify update_tips callbacks in push test casesJacques Germishuys2014-04-211-35/+83
| * Fire update_tips callback also for pushes.Jacques Germishuys2014-04-211-17/+29
| * Correct argument order of git__calloc()Jacques Germishuys2014-04-211-1/+1
| * It is safe to free() a NULL pointerJacques Germishuys2014-04-211-3/+1
| * Don't redefine the same callback types, their signatures may changeJacques Germishuys2014-04-2116-21/+21
| * Rename progress callback to sideband_progressJacques Germishuys2014-04-213-5/+5
| * Check the return codes of remote callbacks.Jacques Germishuys2014-04-212-7/+10
| * Fire progress callbacks also for pushes.Jacques Germishuys2014-04-202-37/+37
* | Merge pull request #2297 from libgit2/rb/status-with-precomposed-changesVicent Marti2014-04-252-39/+191
|\ \
| * | Improve docs for status rename detection limitsrb/status-with-precomposed-changesRussell Belfer2014-04-242-4/+32
| * | Test toggling core.precomposeunicode yields renameRussell Belfer2014-04-241-0/+69
| * | Test decomposed unicode renames work as expectedRussell Belfer2014-04-241-37/+92
* | | Merge pull request #2241 from libgit2/rb/stash-skip-submodulesVicent Marti2014-04-257-107/+211
|\ \ \
| * | | Handle explicitly ignored dir slightly differentlyrb/stash-skip-submodulesRussell Belfer2014-04-241-8/+9
| * | | Treat ignored, empty, and untracked dirs differentRussell Belfer2014-04-234-22/+39
| * | | Make checkout match diff for untracked/ignored dirRussell Belfer2014-04-226-99/+146
| * | | Failing test for stashing a buried ignored fileRussell Belfer2014-04-221-0/+13
| * | | Make stash and checkout ignore contained reposRussell Belfer2014-04-224-12/+38
* | | | Merge pull request #2294 from ethomson/merge_checkout_strategyRussell Belfer2014-04-243-14/+30
|\ \ \ \ | |_|/ / |/| | |
| * | | merge: checkout default shouldn't clobber givenEdward Thomson2014-04-233-15/+14
| * | | merge: default checkout strategy for should be SAFEEdward Thomson2014-04-232-1/+18
* | | | Merge pull request #2295 from libgit2/cmn/fetchhead-quoteVicent Marti2014-04-243-1/+13
|\ \ \ \ | |/ / / |/| | |
| * | | fetchhead: deal with quotes in branch namesCarlos Martín Nieto2014-04-243-1/+13
|/ / /
* | | Merge pull request #2291 from ethomson/patch_binaryVicent Marti2014-04-237-6/+452
|\ \ \
| * | | patch: emit binary patches (optionally)Edward Thomson2014-04-227-6/+452
* | | | Merge pull request #2283 from phkelley/win32_fsVicent Marti2014-04-2322-491/+1549
|\ \ \ \
| * | | | React to feedback for UTF-8 <-> WCHAR and reparse workPhilip Kelley2014-04-239-39/+35
| * | | | Handle win32 reparse points properlyEdward Thomson2014-04-227-132/+966
| * | | | Win32: UTF-8 <-> WCHAR conversion overhaulPhilip Kelley2014-04-1918-431/+659
| | |_|/ | |/| |