summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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-213-18/+110
| * | mingw: short-circuit the conversion of `/dev/null` to UTF-16Johannes Schindelin2019-12-211-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
|\ \ \ \ \
| * | | | | bisect--helper: convert `*_warning` char pointers to char arrays.Tanushree Tumane2019-12-171-2/+2
| | |_|/ / | |/| | |
* | | | | Merge branch 'rs/xdiff-ignore-ws-w-func-context'Junio C Hamano2019-12-251-0/+23
|\ \ \ \ \
| * | | | | t4015: improve coverage of function context testRené Scharfe2019-12-191-0/+23
* | | | | | Merge branch 'js/add-p-in-c'Junio C Hamano2019-12-258-19/+1464
|\ \ \ \ \ \
| * | | | | | built-in add -p: show helpful hint when nothing can be stagedJohannes Schindelin2019-12-131-4/+13
| * | | | | | built-in add -p: only show the applicable parts of the help textJohannes Schindelin2019-12-131-4/+28
| * | | | | | built-in add -p: implement the 'q' ("quit") commandJohannes Schindelin2019-12-131-6/+11
| * | | | | | built-in add -p: implement the '/' ("search regex") commandJohannes Schindelin2019-12-132-1/+63
| * | | | | | built-in add -p: implement the 'g' ("goto") commandJohannes Schindelin2019-12-132-0/+104
| * | | | | | built-in add -p: implement hunk editingJohannes Schindelin2019-12-133-17/+325
| * | | | | | strbuf: add a helper function to call the editor "on an strbuf"Johannes Schindelin2019-12-132-0/+39
| * | | | | | built-in add -p: coalesce hunks after splitting themJohannes Schindelin2019-12-131-1/+57
| * | | | | | built-in add -p: implement the hunk splitting featureJohannes Schindelin2019-12-132-2/+225
| * | | | | | built-in add -p: show different prompts for mode changes and deletionsJohannes Schindelin2019-12-131-2/+20
| * | | | | | built-in app -p: allow selecting a mode change as a "hunk"Johannes Schindelin2019-12-131-5/+104
| * | | | | | built-in add -p: handle deleted empty filesJohannes Schindelin2019-12-131-2/+11
| * | | | | | built-in add -p: support multi-file diffsJohannes Schindelin2019-12-131-38/+53
| * | | | | | built-in add -p: offer a helpful error message when hunk navigation failedJohannes Schindelin2019-12-131-11/+33
View Lorry Controller Status