summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | config: check for OOM when writingcmn/config-write-preserve-caseCarlos Martín Nieto2017-10-301-0/+2
| * | | | | CHANGELOG: add note about config writing changesCarlos Martín Nieto2017-10-301-0/+4
| * | | | | config: preserve the original case when writing out new sections and varsCarlos Martín Nieto2017-10-301-9/+18
| * | | | | config: add failing test for preserving case when writing keysCarlos Martín Nieto2017-10-301-0/+23
|/ / / / /
* | | | | Merge pull request #4373 from cjhoward92/examples/log-show-log-sizeCarlos Martín Nieto2017-10-292-7/+10
|\ \ \ \ \
| * | | | | examples: log: pass options pointer to print_commitCarson Howard2017-10-131-7/+7
| * | | | | PROJECTS: remove example for --log-sizeCarson Howard2017-10-111-4/+0
| * | | | | example-log: add support for --log-sizeCarson Howard2017-10-111-4/+11
* | | | | | Merge pull request #3944 from mhagger/diff-indent-heuristicCarlos Martín Nieto2017-10-292-78/+523
|\ \ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into diff-indent-heuristicCarlos Martín Nieto2017-10-29552-4452/+15648
| |\ \ \ \ \ \
| * | | | | | | Introduce a new `XDL_INLINE` macro and use it instead of `inline`Michael Haggerty2017-10-141-3/+8
| * | | | | | | xdiff: rename "struct group" to "struct xdlgroup"Jeff King2016-10-031-7/+7
| * | | | | | | diff: improve positioning of add/delete blocks in diffsMichael Haggerty2016-09-292-0/+327
| * | | | | | | xdl_change_compact(): introduce the concept of a change groupMichael Haggerty2016-09-291-78/+185
| * | | | | | | recs_match(): take two xrecord_t pointers as argumentsMichael Haggerty2016-09-291-6/+6
| * | | | | | | xdiff: add recs_match helper functionJacob Keller2016-09-291-4/+10
* | | | | | | | Merge pull request #4357 from invenia/cv/ssh-passphrase-incorrectEdward Thomson2017-10-281-2/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | transports: ssh: ask for credentials again when passphrase is wrongCurtis Vogt2017-10-201-2/+4
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge pull request #4384 from pks-t/pks/rm-example-makefileEdward Thomson2017-10-282-32/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | examples: remove MakefilePatrick Steinhardt2017-10-202-32/+0
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #4382 from pks-t/pks/cmake-source-dirEdward Thomson2017-10-204-33/+33
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | cmake: use project-relative binary and source directoriesPatrick Steinhardt2017-10-204-33/+33
|/ / / / / /
* | | | | | Merge pull request #4375 from mhagger/cmake-version-3.0.xPatrick Steinhardt2017-10-191-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix compilation for CMake versions 3.0.x where x >= 1Michael Haggerty2017-10-141-1/+1
|/ / / / /
* | | | | Merge pull request #4356 from pks-t/pks/static-clarEdward Thomson2017-10-091-0/+4
|\ \ \ \ \
| * | | | | cmake: use static dependencies when building static libgit2Patrick Steinhardt2017-09-221-0/+4
| | |/ / / | |/| | |
* | | | | Merge pull request #4372 from pks-t/pks/xcode-linkingEdward Thomson2017-10-091-1/+4
|\ \ \ \ \
| * | | | | cmake: fix linking in Xcode with object libraries onlyPatrick Steinhardt2017-10-091-1/+4
* | | | | | Merge pull request #4368 from pks-t/pks/smart-negotiate-revwalk-memleakEdward Thomson2017-10-091-6/+6
|\ \ \ \ \ \
| * | | | | | transports: smart: fix memory leak when skipping symbolic refsPatrick Steinhardt2017-10-091-6/+6
* | | | | | | Merge pull request #4371 from pks-t/pks/test-checkout-tree-refactoringCarlos Martín Nieto2017-10-091-17/+16
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | tests: checkout::tree: check that the status list catches mode changesPatrick Steinhardt2017-10-091-0/+2
| * | | | | | tests: checkout::tree: extract check for status entrycountPatrick Steinhardt2017-10-091-17/+14
|/ / / / / /
| | | | * | config: keep the output parameter at the start of the functionCarlos Martín Nieto2017-11-041-5/+6
| | | | * | tests: resolve the real path for the sandbox in includeIf testsCarlos Martín Nieto2017-10-311-6/+14
| | | | * | config_file: implement "gitdir/i" conditionalPatrick Steinhardt2017-10-092-4/+38
| | | | * | config_file: implement conditional "gitdir" includesPatrick Steinhardt2017-10-092-0/+167
| | | | * | config_file: make repo and config path accessible to readerPatrick Steinhardt2017-10-091-5/+14
| | | | * | config_file: extract function to parse include pathPatrick Steinhardt2017-10-091-27/+35
| | | | * | config: pass repository when opening config filesPatrick Steinhardt2017-10-0913-61/+72
| | | | * | repository: constify several repo parameters for gettersPatrick Steinhardt2017-10-092-12/+12
| | | | * | path: expose `git_path_is_dirsep`Patrick Steinhardt2017-10-092-3/+7
| | | | * | path: expose `git_path_is_absolute`Patrick Steinhardt2017-10-092-7/+11
| |_|_|/ / |/| | | |
* | | | | Merge pull request #4369 from libgit2/ethomson/checkout_typechangePatrick Steinhardt2017-10-092-1/+63
|\ \ \ \ \
| * | | | | checkout: test force checkout when mode changesethomson/checkout_typechangeEdward Thomson2017-10-071-0/+45
| * | | | | checkout: do not test file mode on WindowsEdward Thomson2017-10-071-0/+8
| * | | | | checkout: treat files as modified if mode differsEdward Thomson2017-10-061-1/+10
* | | | | | Merge pull request #4359 from libgit2/cmn/proxy-options-freeEdward Thomson2017-10-073-0/+10
|\ \ \ \ \ \
| * | | | | | proxy: rename the options freeing functioncmn/proxy-options-freeCarlos Martín Nieto2017-10-073-4/+4
| * | | | | | curl: free the user-provided proxy credentialsCarlos Martín Nieto2017-09-271-0/+1
View Lorry Controller Status