summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* reset: perform the checkout before moving HEAD or the indexcmn/reset-dir-fileCarlos Martín Nieto2015-12-092-6/+58
* CHANGELOG: add some things we missedCarlos Martín Nieto2015-12-091-1/+11
* Merge pull request #3539 from libgit2/typedef-submodule-cbCarlos Martín Nieto2015-12-082-2/+13
|\
| * Play nice with the docs.typedef-submodule-cbjoshaber2015-12-081-5/+4
| * Use a typedef for the submodule_foreach callback.joshaber2015-12-082-2/+14
* | Merge pull request #3537 from libgit2/cmn/tree-is-sortedEdward Thomson2015-12-082-1/+6
|\ \ | |/ |/|
| * tree: mark a tree as already sortedcmn/tree-is-sortedCarlos Martín Nieto2015-12-062-1/+6
* | Merge pull request #3526 from sschuberth/cmake-number-compareCarlos Martín Nieto2015-12-061-1/+1
|\ \
| * | CMakeLists: Compare CMAKE_SIZEOF_VOID_P as a number, not as a stringSebastian Schuberth2015-12-021-1/+1
* | | Merge pull request #3529 from mgorny/fix-checkout-test-umaskCarlos Martín Nieto2015-12-061-1/+1
|\ \ \ | |_|/ |/| |
| * | checkout test: Apply umask to file-mode test as wellMichał Górny2015-12-011-1/+1
| |/
* | Merge pull request #3530 from libgit2/cmn/parse-modeEdward Thomson2015-12-031-5/+21
|\ \
| * | tree: use a specialised mode parse functioncmn/parse-modeCarlos Martín Nieto2015-12-021-5/+21
| |/
* | Merge pull request #3534 from ethomson/index_canonicalize_fixCarlos Martín Nieto2015-12-031-1/+1
|\ \ | |/ |/|
| * index: canonicalize inserted paths safelyEdward Thomson2015-12-031-1/+1
|/
* Merge pull request #3527 from pks-t/pks/tree-entry-memleakEdward Thomson2015-12-011-0/+2
|\
| * tree: mark cloned tree entries as un-pooledPatrick Steinhardt2015-12-011-0/+2
|/
* Merge pull request #3508 from libgit2/cmn/tree-parse-speedEdward Thomson2015-11-302-17/+55
|\
| * tree: ensure the entry filename fits in 16 bitscmn/tree-parse-speedCarlos Martín Nieto2015-11-301-16/+26
| * tree: make path len uint16_t and avoid holesCarlos Martín Nieto2015-11-282-2/+2
| * tree: calculate the filename length onceCarlos Martín Nieto2015-11-281-5/+8
| * tree: pool the entry memory allocationsCarlos Martín Nieto2015-11-282-6/+33
| * tree: avoid advancing over the filename multiple timesCarlos Martín Nieto2015-11-281-4/+2
* | Merge pull request #3525 from pks-t/pks/fix-nested-struct-warningCarlos Martín Nieto2015-11-302-3/+1
|\ \
| * | object: remove unused constant OBJECT_BASE_SIZEPatrick Steinhardt2015-11-301-2/+0
| * | tests: fix warning for nested struct initializationPatrick Steinhardt2015-11-301-1/+1
|/ /
* | Merge pull request #3513 from ethomson/merge_recursiveCarlos Martín Nieto2015-11-30175-192/+1237
|\ \ | |/ |/|
| * recursive merge: add a recursion limitEdward Thomson2015-11-253-3/+49
| * merge: handle conflicts in recursive base buildingEdward Thomson2015-11-2528-20/+201
| * merge tests: add complex recursive exampleEdward Thomson2015-11-2512-6/+39
| * recursive: test conflict output during recursive mergeEdward Thomson2015-11-252-0/+81
| * merge tests: move expected data into own fileEdward Thomson2015-11-256-44/+47
| * merge: use annotated commits for recursionEdward Thomson2015-11-253-68/+122
| * merge: merge annotated commits instead of regular commitsEdward Thomson2015-11-253-166/+159
| * merge: octopus merge common ancestors when >2Edward Thomson2015-11-253-119/+189
| * merge: add recursive test with conflicting contentsEdward Thomson2015-11-259-0/+32
| * merge: compute octopus merge basesEdward Thomson2015-11-251-89/+100
| * merge: add recursive test with three merge basesEdward Thomson2015-11-2528-0/+65
| * merge: improve test names in recursive merge testsEdward Thomson2015-11-251-8/+8
| * merge: add a third-level recursive mergeEdward Thomson2015-11-2513-0/+58
| * merge: add a second-level recursive mergeEdward Thomson2015-11-2512-2/+57
| * merge: build virtual base of multiple merge basesEdward Thomson2015-11-251-10/+123
| * merge: add simple recursive testEdward Thomson2015-11-2571-5/+245
| * merge: rename `git_merge_tree_flags_t` -> `git_merge_flags_t`Edward Thomson2015-11-259-34/+44
* | Merge pull request #3523 from pks-t/memleak-fixesEdward Thomson2015-11-243-1/+6
|\ \
| * | tests: win32::longpath: free expected_msgPatrick Steinhardt2015-11-241-0/+2
| * | tests: config::stress: free `git_config` structsPatrick Steinhardt2015-11-241-0/+3
| * | tests: config::global: fix memleak in open_programdataPatrick Steinhardt2015-11-241-1/+1
* | | Merge pull request #3520 from ethomson/checkout_nsecsCarlos Martín Nieto2015-11-245-66/+46
|\ \ \ | |/ / |/| |
| * | checkout: only consider nsecs when built that wayEdward Thomson2015-11-235-66/+46
|/ /