summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* merge: Use `git_index__fill` to populate the indexvmg/index-fillVicent Marti2015-12-163-5/+41
* Merge pull request #3528 from chescock/Passthrough-from-credential-callbackEdward Thomson2015-12-141-1/+4
|\
| * Treat GIT_PASSTHROUGH as though git_cred_acquire_cb isn't set.Chris Hescock2015-12-011-1/+4
* | Merge pull request #3521 from pks-t/blame-line-overflowEdward Thomson2015-12-143-31/+37
|\ \
| * | blame: use size_t for line counts in git_blame__entryPatrick Steinhardt2015-12-012-19/+25
| * | blame: use size_t for line counts in git_blame_hunkPatrick Steinhardt2015-12-011-12/+12
* | | Merge pull request #3522 from pks-t/email-format-commit-messageCarlos Martín Nieto2015-12-103-1/+39
|\ \ \
| * | | diff: include commit message when formatting patchPatrick Steinhardt2015-12-011-1/+10
| * | | commit: introduce `git_commit_body`Patrick Steinhardt2015-12-012-0/+29
| |/ /
* | | Merge pull request #3538 from pks-t/pks/index-memory-leakCarlos Martín Nieto2015-12-101-1/+1
|\ \ \
| * | | index: always queue `remove_entry` for removalPatrick Steinhardt2015-12-081-1/+1
| | |/ | |/|
* | | reset: perform the checkout before moving HEAD or the indexcmn/reset-dir-fileCarlos Martín Nieto2015-12-091-6/+6
* | | Merge pull request #3539 from libgit2/typedef-submodule-cbCarlos Martín Nieto2015-12-081-1/+1
|\ \ \
| * | | Use a typedef for the submodule_foreach callback.joshaber2015-12-081-1/+1
* | | | tree: mark a tree as already sortedcmn/tree-is-sortedCarlos Martín Nieto2015-12-061-1/+2
|/ / /
* | | 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
| |/ /
* | | index: canonicalize inserted paths safelyEdward Thomson2015-12-031-1/+1
|/ /
* | 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
View Lorry Controller Status