summaryrefslogtreecommitdiff
path: root/include/git2
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3521 from pks-t/blame-line-overflowEdward Thomson2015-12-141-6/+6
|\
| * blame: use size_t for line counts in git_blame_hunkPatrick Steinhardt2015-12-011-6/+6
* | Merge pull request #3522 from pks-t/email-format-commit-messageCarlos Martín Nieto2015-12-102-1/+17
|\ \
| * | diff: include commit message when formatting patchPatrick Steinhardt2015-12-011-1/+4
| * | commit: introduce `git_commit_body`Patrick Steinhardt2015-12-011-0/+13
| |/
* | Play nice with the docs.typedef-submodule-cbjoshaber2015-12-081-5/+4
* | Use a typedef for the submodule_foreach callback.joshaber2015-12-081-1/+13
|/
* recursive merge: add a recursion limitEdward Thomson2015-11-251-0/+8
* merge: add simple recursive testEdward Thomson2015-11-251-4/+12
* merge: rename `git_merge_tree_flags_t` -> `git_merge_flags_t`Edward Thomson2015-11-251-17/+19
* repository: distinguish sequencer cherry-pick and revertcmn/repository-state-sequencerCarlos Martín Nieto2015-11-201-0/+2
* settings: allow users to set PROGRAMDATAEdward Thomson2015-11-161-5/+6
* Merge pull request #3170 from CmdrMoozy/nsec_fixCarlos Martín Nieto2015-11-121-2/+3
|\
| * Merge branch 'master' into nsec_fix_nextAxel Rasmussen2015-10-014-3/+23
| |\
| * | settings: expose GIT_USE_NSEC flag in git_libgit2_featuresAxel Rasmussen2015-09-181-2/+3
* | | settings: add a setter for a custom user-agentCarlos Martín Nieto2015-11-121-0/+3
* | | stream: allow registering a user-provided TLS constructorcmn/tls-registerCarlos Martín Nieto2015-11-031-0/+13
* | | Add diff progress callback.Jason Haslam2015-11-021-5/+24
* | | Fix build for custom transport usersLeo Yang2015-10-301-0/+1
* | | merge: Implement `GIT_MERGE_TREE_SKIP_REUC`Vicent Marti2015-10-271-0/+5
* | | Merge pull request #3477 from linquize/inttypes.hEdward Thomson2015-10-231-1/+1
|\ \ \
| * | | inttypes.h is built-in header file since MSVC 2013Linquize2015-10-221-1/+1
* | | | merge: add GIT_MERGE_TREE_FAIL_ON_CONFLICTEdward Thomson2015-10-222-0/+8
|/ / /
* | | Merge pull request #3475 from libgit2/cmn/programdata-configEdward Thomson2015-10-211-5/+19
|\ \ \
| * | | config: add a ProgramData levelcmn/programdata-configCarlos Martín Nieto2015-10-211-5/+19
* | | | win32: add c linkage guard around inttypes.h inclusionEdward Thomson2015-10-211-6/+8
|/ / /
* | | Merge pull request #3444 from ethomson/add_preserves_conflict_modeCarlos Martín Nieto2015-10-151-7/+21
|\ \ \ | |_|/ |/| |
| * | index: also try conflict mode when insertingEdward Thomson2015-09-301-7/+21
| |/
* | refdb and odb backends must provide `free` functionArthur Schreiber2015-10-012-2/+6
* | Merge pull request #3411 from spraints/custom-push-headersCarlos Martín Nieto2015-09-302-1/+17
|\ \ | |/ |/|
| * Accept custom headers for fetch tooMatt Burke2015-09-101-0/+5
| * Tell the git_transport about the custom_headersMatt Burke2015-09-082-1/+7
| * Add custom_headers to git_push_optionsMatt Burke2015-09-081-0/+5
| * Drop extra_http_headers from git_remoteMatt Burke2015-09-081-3/+0
| * Allow the world to set HTTP headers for remotesMatt Burke2015-09-041-0/+3
* | New API: git_index_find_prefixLeo Yang2015-09-041-0/+11
|/
* config: correct documentation for non-existent config fileCarlos Martín Nieto2015-09-031-2/+4
* Merge pull request #3402 from ethomson/faster_diffCarlos Martín Nieto2015-09-011-2/+6
|\
| * iterator: better document GIT_DIFF_DISABLE_PATHSPEC_MATCHEdward Thomson2015-08-311-4/+6
| * diff: drop `FILELIST_MATCH`Edward Thomson2015-08-301-7/+0
| * diff: better document GIT_DIFF_PATHSPEC_DISABLEEdward Thomson2015-08-281-1/+3
| * Move filelist into the iterator handling itself.Edward Thomson2015-08-281-0/+7
* | Merge pull request #3401 from phatblat/pb/doc-warningCarlos Martín Nieto2015-08-301-1/+1
|\ \ | |/ |/|
| * Escape @ in doc commentBen Chatelain2015-08-291-1/+1
* | cred: add a free function wrappercmn/smart-callbacksCarlos Martín Nieto2015-08-191-0/+11
* | transport: provide a way to get the callbacksCarlos Martín Nieto2015-08-191-0/+22
* | config: perform unlocking via git_transactioncmn/config-txCarlos Martín Nieto2015-08-121-16/+7
* | config: expose locking via the main APICarlos Martín Nieto2015-08-121-0/+27
* | config: implement basic transactional supportCarlos Martín Nieto2015-08-121-0/+14
|/
* Make giterr_detach no longer publicMichael Procter2015-08-031-12/+0