summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* v1.3: update version numberethomson/v1_3Edward Thomson2021-09-223-5/+5
* v1.3: changelogEdward Thomson2021-09-221-0/+46
* Merge pull request #6068 from libgit2/ethomson/diff_enumEdward Thomson2021-09-221-4/+3
|\
| * diff: update `GIT_DIFF_IGNORE_BLANK_LINES`ethomson/diff_enumEdward Thomson2021-09-211-4/+3
* | Merge pull request #6067 from libgit2/ethomson/filter_commit_idEdward Thomson2021-09-219-33/+81
|\ \
| * | filter: use a `git_oid` in filter options, not a pointerethomson/filter_commit_idEdward Thomson2021-09-219-33/+81
| |/
* | Merge pull request #6064 from libgit2/ethomson/ci_libssh2Edward Thomson2021-09-214-6/+4
|\ \
| * | ci: pull libssh2 from www.libssh2.orgethomson/ci_libssh2Edward Thomson2021-09-214-6/+4
* | | Merge pull request #6066 from libgit2/ethomson/deprecationEdward Thomson2021-09-212-8/+7
|\ \ \ | |_|/ |/| |
| * | rebase: fix (deprecated) signing testethomson/deprecationEdward Thomson2021-09-211-7/+7
| * | email: don't clear buffer in append functionEdward Thomson2021-09-211-1/+0
|/ /
* | Merge pull request #6061 from libgit2/ethomson/emailEdward Thomson2021-09-2012-267/+1026
|\ \
| * | diff: deprecate diff_format_emailethomson/emailEdward Thomson2021-09-184-116/+139
| * | email: include renames by defaultEdward Thomson2021-09-183-5/+132
| * | email: include binary diffs by defaultEdward Thomson2021-09-183-9/+70
| * | diff: use `git_email_create` in `diff_format_email`Edward Thomson2021-09-181-142/+7
| * | email: introduce 'append_from_diff'Edward Thomson2021-09-182-1/+51
| * | diff_commit_as_email: use `email_create`Edward Thomson2021-09-181-10/+13
| * | email: allow `git_diff_commit_as_email` to take 0 as patch indexEdward Thomson2021-09-181-1/+0
| * | email: introduce `git_email_create_from_diff`Edward Thomson2021-09-184-53/+195
| * | email: introduce `git_email_create_from_commit`Edward Thomson2021-09-184-0/+481
| * | buf: introduce `git_buf_truncate_at`Edward Thomson2021-09-142-0/+8
* | | Merge pull request #6063 from libgit2/ethomson/win32_envvarEdward Thomson2021-09-201-1/+1
|\ \ \ | |_|/ |/| |
| * | win32: allow empty environment variablesEdward Thomson2021-09-201-1/+1
|/ /
* | Merge pull request #6020 from lolgear/refactoring/stdint_ifdef_condition_has_...Edward Thomson2021-09-201-3/+3
|\ \
| * | include: stdint header condition has been reverted.Dmitry Lobanov2021-08-301-3/+3
* | | Merge branch 'sathieu/patch-1' into mainEdward Thomson2021-09-201-0/+9
|\ \ \
| * | | httpproxy: move empty string test above configEdward Thomson2021-09-201-4/+9
| * | | Add test to ensure empty proxy env behaves like unset envMathieu Parent2021-09-141-0/+4
* | | | Merge branch 'longpath_filter_bug' into mainEdward Thomson2021-09-201-4/+23
|\ \ \ \
| * | | | win32: ensure content filtering occurs in longpath testEdward Thomson2021-09-201-4/+23
|/ / / /
* | | | Merge remote-tracking branch 'mathworks/longpath_filter_bug' into mainEdward Thomson2021-09-202-7/+28
|\ \ \ \
| * | | | Apply suggestions from code reviewLaurence McGlashan2021-09-141-0/+2
| * | | | Refactor shared code in longpath test.Laurence McGlashan2021-09-141-22/+12
| * | | | If longpaths is true and filters are enabled, pass git_repository through the...Laurence McGlashan2021-09-142-3/+32
| |/ / /
* | | | Merge pull request #6058 from mathworks/proxy_config_with_detached_remoteEdward Thomson2021-09-202-5/+52
|\ \ \ \
| * | | | Update remote.cLaurence McGlashan2021-09-181-1/+1
| * | | | Apply suggestions from code reviewLaurence McGlashan2021-09-181-7/+2
| * | | | Update formatting.Laurence McGlashan2021-09-161-3/+3
| * | | | Allow proxy options when connecting with a detached remote.Laurence McGlashan2021-09-162-4/+56
* | | | | Merge pull request #6060 from ccstolley/ccs_merge_bugfixEdward Thomson2021-09-2010-2/+65
|\ \ \ \ \
| * | | | | Add test for revert+rename bug.Colin Stolley2021-09-159-0/+60
| * | | | | merge: Check file mode when resolving renames.Colin Stolley2021-09-151-2/+5
| |/ / / /
* | | | | Merge pull request #6050 from shijinglu/patch-1Edward Thomson2021-09-181-0/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Update README.mdshijing2021-09-121-0/+1
| |/ / /
* | | | Merge pull request #6053 from stac47/ssh2_discoveryEdward Thomson2021-09-142-0/+20
|\ \ \ \ | |_|_|/ |/| | |
| * | | Update src/CMakeLists.txtLaurent Stacul2021-09-141-7/+7
| * | | Discover libssh2 without pkg-configLaurent Stacul2021-09-142-0/+20
| |/ /
* | | Merge pull request #6041 from Esri/duncan/typeofEdward Thomson2021-09-142-8/+2
|\ \ \
| * | | Use __typeof__ GNUC keyword for ISO C compatibilityDuncan Thomson2021-09-082-8/+2
| |/ /