summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | Merge branch 'ds/sparse-cone'Junio C Hamano2020-01-062-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Documentation/git-sparse-checkout.txt: fix a typoTaylor Blau2020-01-041-1/+1
| * | | | | | | | | sparse-checkout: use extern for global variablesDerrick Stolee2020-01-021-2/+2
* | | | | | | | | | Merge branch 'ds/commit-graph-set-size-mult'Junio C Hamano2020-01-062-4/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | commit-graph: prefer default size_mult when given zeroDerrick Stolee2020-01-022-4/+4
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'en/merge-recursive-oid-eq-simplify'Junio C Hamano2020-01-061-22/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | merge-recursive: remove unnecessary oid_eq functionElijah Newren2020-01-021-22/+11
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'ds/sparse-list-in-cone-mode'Junio C Hamano2020-01-063-1/+80
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | sparse-checkout: document interactions with submodulesDerrick Stolee2019-12-302-0/+38
| * | | | | | | | | | sparse-checkout: list directories in cone modeDerrick Stolee2019-12-303-1/+42
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks'Junio C Hamano2020-01-063-9/+9
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | mingw: only test index entries for backslashes, not tree entriesJohannes Schindelin2020-01-023-9/+9
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'pb/clarify-line-log-doc'Junio C Hamano2020-01-062-4/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | doc: log, gitk: line-log arguments must exist in starting revisionPhilippe Blain2019-12-262-2/+4
| * | | | | | | | | doc: log, gitk: document accepted line-log diff formatsPhilippe Blain2019-12-262-2/+8
* | | | | | | | | | Merge branch 'ew/packfile-syscall-optim'Junio C Hamano2020-01-061-14/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | packfile: replace lseek+read with preadEric Wong2019-12-261-3/+2
| * | | | | | | | | | packfile: remove redundant fcntl F_GETFD/F_SETFDEric Wong2019-12-261-11/+0
| |/ / / / / / / / /
* | | | | | | | | | Git 2.25-rc1v2.25.0-rc1Junio C Hamano2020-01-022-1/+14
* | | | | | | | | | Merge branch 'js/use-test-tool-on-path'Junio C Hamano2020-01-021-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t3008: find test-tool through path lookupJohannes Sixt2019-12-271-1/+1
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'js/mingw-reserved-filenames'Junio C Hamano2020-01-023-24/+122
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | mingw: refuse paths containing reserved namesJohannes Schindelin2019-12-223-18/+110
| * | | | | | | | | | mingw: short-circuit the conversion of `/dev/null` to UTF-16Johannes Schindelin2019-12-221-10/+16
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'en/rebase-signoff-fix'Junio C Hamano2020-01-021-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | rebase: fix saving of --signoff state for am-based rebasesElijah Newren2019-12-201-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'em/freebsd-cirrus-ci'Junio C Hamano2020-01-021-0/+15
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | CI: add FreeBSD CI support via Cirrus-CIEd Maste2019-12-201-0/+15
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'bk/p4-misc-usability'Junio C Hamano2020-01-021-32/+42
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-p4: show detailed help when parsing options failBen Keene2019-12-161-1/+6
| * | | | | | | | | | git-p4: yes/no prompts should sanitize user textBen Keene2019-12-161-31/+36
| |/ / / / / / / / /
* | | | | | | | | / mailmap: mask accentless variant for Công DanhJunio C Hamano2019-12-261-0/+1
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | Git 2.25-rc0v2.25.0-rc0Junio C Hamano2019-12-252-6/+27
* | | | | | | | | Merge branch 'en/fill-directory-fixes'Junio C Hamano2019-12-253-51/+354
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | dir.c: use st_add3() for allocation sizeJunio C Hamano2019-12-201-1/+1
| * | | | | | | | | dir: consolidate similar code in treat_directory()Elijah Newren2019-12-191-11/+7
| * | | | | | | | | dir: synchronize treat_leading_path() and read_directory_recursive()Elijah Newren2019-12-193-2/+32
| * | | | | | | | | dir: fix checks on common prefix directoryElijah Newren2019-12-192-14/+59
| * | | | | | | | | dir: break part of read_directory_recursive() out for reuseElijah Newren2019-12-111-23/+37
| * | | | | | | | | dir: exit before wildcard fall-through if there is no wildcardElijah Newren2019-12-112-2/+9
| * | | | | | | | | dir: remove stray quote character in commentElijah Newren2019-12-111-1/+1
| * | | | | | | | | Revert "dir.c: make 'git-status --ignored' work within leading directories"Elijah Newren2019-12-112-5/+7
| * | | | | | | | | t3011: demonstrate directory traversal failuresElijah Newren2019-12-111-0/+209
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'rs/test-cleanup'Junio C Hamano2019-12-255-5/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t6030: don't create unused fileRené Scharfe2019-12-181-1/+1
| * | | | | | | | | t5580: don't create unused fileRené Scharfe2019-12-181-1/+1
| * | | | | | | | | t3501: don't create unused fileRené Scharfe2019-12-181-1/+1
| * | | | | | | | | t7004: don't create unused fileRené Scharfe2019-12-111-1/+0
| * | | | | | | | | t4256: don't create unused fileRené Scharfe2019-12-111-1/+1
* | | | | | | | | | Merge branch 'mr/bisect-save-pointer-to-const-string'Junio C Hamano2019-12-251-2/+2
|\ \ \ \ \ \ \ \ \ \