summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Introduce diff3 mode for checking out conflictsEdward Thomson2014-01-204-6/+35
* Don't try to merge binary filesEdward Thomson2014-01-203-2/+90
* merge_file should use more aggressive levelsEdward Thomson2014-01-204-13/+32
* Merge pull request #2063 from linquize/reflog-msg-nullRussell Belfer2014-01-201-0/+2
|\
| * git_reflog_entry_message can be nullLinquize2014-01-201-0/+2
* | fix corner cases and an undefined behaviorPatrick Reynolds2014-01-201-3/+6
|/
* Merge pull request #2059 from linquize/git_config_get_crashEdward Thomson2014-01-181-0/+1
|\
| * Fix segfault when calling git_config_get_* functions when a config fails to loadLinquize2014-01-181-0/+1
* | Convert gitdir paths to posix on WindowsRussell Belfer2014-01-171-1/+5
* | Merge pull request #2050 from libgit2/cmn/always-reflog-messageVicent Marti2014-01-1511-74/+68
|\ \
| * | refs: remove the _with_log differentiationCarlos Martín Nieto2014-01-1511-74/+68
* | | Move libgit2 settings out of utilEdward Thomson2014-01-142-123/+134
* | | unnecessary includeEdward Thomson2014-01-141-1/+0
|/ /
* | Merge pull request #2047 from arthurschreiber/arthur/fix-dup-functionsVicent Marti2014-01-144-26/+30
|\ \
| * | Align git_tree_entry_dup.Arthur Schreiber2014-01-141-9/+8
| * | Align git_signature_dup.Arthur Schreiber2014-01-143-17/+22
* | | We don't need memset here.Arthur Schreiber2014-01-141-2/+0
* | | Don't duplicate state that's only used when fetching.Arthur Schreiber2014-01-141-1/+0
|/ /
* | Add `git_remote_dup`.Arthur Schreiber2014-01-141-0/+41
* | Merge pull request #2043 from arthurschreiber/arthur/fix-memory-leaksVicent Marti2014-01-145-10/+19
|\ \
| * | Incorporate @arrbee's suggestions.Arthur Schreiber2014-01-141-14/+12
| * | Incorporate @ethomson's suggestions.Arthur Schreiber2014-01-131-16/+15
| * | Fix a double free issue in `git_blame__alloc`.Arthur Schreiber2014-01-131-1/+0
| * | Fix a memory leak in `hash_and_save` and `inject_object`.Arthur Schreiber2014-01-131-4/+12
| * | Fix a memory leak in `config_parse`.Arthur Schreiber2014-01-131-1/+3
| * | Fix a memory leak in `git_config_iterator_glob_new`.Arthur Schreiber2014-01-131-0/+1
| * | Fix a memory leak in `git_pathspec__vinit`.Arthur Schreiber2014-01-131-1/+3
* | | Packbuilder contains its own zstreamEdward Thomson2014-01-144-5/+12
* | | Packbuilder stream deflate instead of one-shotEdward Thomson2014-01-141-64/+81
* | | Refactor zlib for easier deflate streamingEdward Thomson2014-01-146-76/+120
|/ /
* | util: handle NULL pointers passed to git_strarray_free()Brodie Rao2014-01-121-0/+4
* | refs: handle NULL pointers passed to git_reference_iterator_free()Brodie Rao2014-01-121-0/+3
* | oid: handle NULL pointers passed to git_oid_shorten_free()Brodie Rao2014-01-121-0/+3
* | odb: handle NULL pointers passed to git_odb_stream_freeBrodie Rao2014-01-121-0/+3
* | config: handle NULL pointers passed to git_config_iterator_free()Brodie Rao2014-01-121-0/+3
* | branch: handle NULL pointers passed to git_branch_iterator_free()Brodie Rao2014-01-121-0/+3
* | Merge pull request #2033 from xtao/blame_orig_commitBen Straub2014-01-081-2/+4
|\ \
| * | Add orig_commit.XTao2014-01-081-2/+4
* | | Handle git_buf's from users more liberallyEdward Thomson2014-01-083-0/+19
* | | Solaris does not have qsort_rJacques Germishuys2014-01-081-0/+1
|/ /
* | Merge pull request #2023 from arthurschreiber/patch-1Vicent Marti2014-01-071-1/+16
|\ \
| * | Allow the log message to be NULL.Arthur Schreiber2014-01-021-2/+2
| * | Add missing `git_reference_symbolic_create_with_log`.Arthur Schreiber2014-01-021-0/+15
| |/
* | Merge pull request #2022 from KTXSoftware/developmentRussell Belfer2014-01-033-1/+22
|\ \
| * | Read the submodule branch option from Git 1.8.2.Robert Konrad2014-01-022-0/+21
| * | Fixed a compile error in VS2013.Robert Konrad2014-01-021-1/+1
| |/
* | Use our strnlen on MacOS for backward compatRussell Belfer2014-01-031-2/+6
* | Fix warnings with submodule changesRussell Belfer2014-01-021-3/+3
|/
* Default value for fetchRecurseSubmodules should be yesLinquize2013-12-311-0/+1
* Accept 'submodule.*.fetchRecurseSubmodules' config 'on-demand' valueLinquize2013-12-312-12/+39
View Lorry Controller Status