summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* tree: use a specialised mode parse functioncmn/parse-modeCarlos Martín Nieto2015-12-021-5/+21
* 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
* | object: remove unused constant OBJECT_BASE_SIZEPatrick Steinhardt2015-11-301-2/+0
* | Merge pull request #3513 from ethomson/merge_recursiveCarlos Martín Nieto2015-11-304-125/+402
|\ \ | |/ |/|
| * recursive merge: add a recursion limitEdward Thomson2015-11-251-3/+10
| * merge: handle conflicts in recursive base buildingEdward Thomson2015-11-251-19/+48
| * 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: compute octopus merge basesEdward Thomson2015-11-251-89/+100
| * merge: build virtual base of multiple merge basesEdward Thomson2015-11-251-10/+123
| * merge: rename `git_merge_tree_flags_t` -> `git_merge_flags_t`Edward Thomson2015-11-252-8/+8
* | checkout: only consider nsecs when built that wayEdward Thomson2015-11-235-66/+46
* | Merge pull request #3515 from jacquesg/unsigned-signedEdward Thomson2015-11-211-1/+1
|\ \ | |/ |/|
| * Make stat.st_size a __int64 not a uint64_tJacques Germishuys2015-11-211-1/+1
* | Merge pull request #3514 from jacquesg/stat-fixesEdward Thomson2015-11-201-8/+6
|\ \
| * | Detect stat's structureJacques Germishuys2015-11-201-8/+6
| |/
* | repository: distinguish sequencer cherry-pick and revertcmn/repository-state-sequencerCarlos Martín Nieto2015-11-202-3/+15
|/
* Merge pull request #3511 from ethomson/racy_fixes_2Carlos Martín Nieto2015-11-171-43/+94
|\
| * racy: make git_index_read_index handle racinessEdward Thomson2015-11-161-30/+48
| * index: clear uptodate bit on saveEdward Thomson2015-11-161-1/+16
| * index: don't detect raciness in uptodate entriesEdward Thomson2015-11-161-2/+7
| * racy-git: do a single index->workdir diffEdward Thomson2015-11-161-10/+23
* | settings: allow users to set PROGRAMDATAEdward Thomson2015-11-161-3/+12
|/
* pool: Never return unaligned buffersvmg/pool-alignVicent Marti2015-11-131-8/+16
* Merge pull request #3170 from CmdrMoozy/nsec_fixCarlos Martín Nieto2015-11-1210-34/+136
|\
| * diff: refactor complex timestamp check into its own functionAxel Rasmussen2015-10-011-5/+27
| * index: don't populate nsec values if GIT_USE_NSEC is offAxel Rasmussen2015-10-011-0/+3
| * Merge branch 'master' into nsec_fix_nextAxel Rasmussen2015-10-0116-56/+226
| |\
| * | apple: work around non-POSIX struct stat on OS X.Axel Rasmussen2015-09-181-6/+17
| * | diff/index: respect USE_NSEC for racily clean file detectionAxel Rasmussen2015-09-184-13/+30
| * | win32: define our own POSIX struct stat, and support USE_NSECAxel Rasmussen2015-09-185-17/+57
| * | cmake: Only provide USE_NSEC if struct stat members are avilable.Axel Rasmussen2015-09-181-2/+1
| * | settings: expose GIT_USE_NSEC flag in git_libgit2_featuresAxel Rasmussen2015-09-181-0/+3
| * | cmake: add USE_NSEC, and only check nanosec m/ctime if enabledAxel Rasmussen2015-09-182-2/+9
* | | Merge pull request #3499 from ethomson/ref_dir_errmsgsCarlos Martín Nieto2015-11-122-5/+21
|\ \ \
| * | | reflog: error when a directory is at reflog pathEdward Thomson2015-11-121-4/+11
| * | | refs: complain when a directory exists at refEdward Thomson2015-11-121-1/+4
| * | | filebuf: detect directories in our wayEdward Thomson2015-11-031-0/+6
* | | | Merge pull request #3448 from libgit2/cmn/custom-agentCarlos Martín Nieto2015-11-125-3/+69
|\ \ \ \
| * | | | winhttp: use a custom user-agent if the user has set itCarlos Martín Nieto2015-11-121-2/+34
| * | | | http: use a custom user-agent if the user has set itCarlos Martín Nieto2015-11-121-1/+12
| * | | | settings: add a setter for a custom user-agentCarlos Martín Nieto2015-11-123-0/+23
* | | | | index: overwrite the path when inserting conflictsntk/case_index_conflictsCarlos Martín Nieto2015-11-121-1/+1
View Lorry Controller Status