summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2020-10-26completion: zsh: reorganize install instructionsLibravatar Felipe Contreras1-7/+9
2020-10-26completion: zsh: fix bash script extensionLibravatar Felipe Contreras1-1/+1
2020-10-26completion: zsh: fix name due to broken autoloadingLibravatar Felipe Contreras1-3/+5
2020-10-26completion: zsh: fix __gitcomp_direct()Libravatar Felipe Contreras2-2/+2
2020-10-26other small fixes for 2.29.2Libravatar Junio C Hamano2-1/+23
2020-10-26Merge branch 'cc/doc-filter-branch-typofix'Libravatar Junio C Hamano1-1/+1
2020-10-26Merge branch 'jk/committer-date-is-author-date-fix'Libravatar Junio C Hamano3-5/+5
2020-10-26t6423: add more details about direct resolution of directoriesLibravatar Elijah Newren1-16/+23
2020-10-26t6423: note improved ort handling with untracked filesLibravatar Elijah Newren1-71/+124
2020-10-26t6423, t6436: note improved ort handling with dirty filesLibravatar Elijah Newren2-119/+165
2020-10-26merge tests: expect slight differences in output for recursive vs. ortLibravatar Elijah Newren3-6/+39
2020-10-26t6423: expect improved conflict markers labels in the ort backendLibravatar Elijah Newren1-10/+28
2020-10-26t6404, t6423: expect improved rename/delete handling in ort backendLibravatar Elijah Newren2-22/+62
2020-10-26t6416: correct expectation for rename/rename(1to2) + directory/fileLibravatar Elijah Newren1-2/+2
2020-10-26merge tests: expect improved directory/file conflict handling in ortLibravatar Elijah Newren6-108/+314
2020-10-26t/: new helper for tests that pass with ort but fail with recursiveLibravatar Elijah Newren6-16/+34
2020-10-26am, sequencer: stop parsing our own committer identLibravatar Jeff King3-44/+5
2020-10-23t1400: prepare for `main` being default branch nameLibravatar Johannes Schindelin1-5/+5
2020-10-23tests: prepare aligned mentions of the default branch nameLibravatar Johannes Schindelin8-82/+82
2020-10-23t9902: prepare a test for the upcoming default branch nameLibravatar Johannes Schindelin1-3/+3
2020-10-23t3200: prepare for `main` being shorter than `master`Libravatar Johannes Schindelin1-2/+2
2020-10-23t5703: adjust a test case for the upcoming default branch nameLibravatar Johannes Schindelin1-3/+3
2020-10-23t6200: adjust suppression pattern to also match "main"Libravatar Johannes Schindelin1-1/+1
2020-10-23tests: start moving to a different default main branch nameLibravatar Johannes Schindelin5-5/+25
2020-10-23t9801: use `--` in preparation for default branch renameLibravatar Johannes Schindelin1-6/+6
2020-10-23fmt-merge-msg: also suppress "into main" by defaultLibravatar Johannes Schindelin1-1/+3
2020-10-23rebase: fix broken email with --committer-date-is-author-dateLibravatar Jeff King2-5/+5
2020-10-23am: fix broken email with --committer-date-is-author-dateLibravatar Jeff King2-3/+3
2020-10-23t3436: check --committer-date-is-author-date result more carefullyLibravatar Jeff King1-7/+7
2020-10-22Sync with Git 2.29.1Libravatar Junio C Hamano4-11/+19
2020-10-22Git 2.29.1Libravatar Junio C Hamano3-2/+13
2020-10-22Merge branch 'js/no-builtins-on-disk-option' into maintLibravatar Junio C Hamano1-9/+6
2020-10-22t7102: prepare expected output inside test_expect_* blockLibravatar Junio C Hamano1-123/+121
2020-10-22t7201: put each command on a separate lineLibravatar Charvi Mendiratta1-8/+18
2020-10-22t7201: use 'git -C' to avoid subshellLibravatar Charvi Mendiratta1-8/+2
2020-10-22t7102,t7201: remove whitespace after redirect operatorLibravatar Charvi Mendiratta2-21/+21
2020-10-22userdiff: support BashLibravatar Victor Engmark18-0/+91
2020-10-21perl: check for perl warnings while running testsLibravatar Jeff King22-19/+30
2020-10-21sequencer: tolerate abbreviated stopped-sha fileLibravatar Jonathan Tan1-1/+1
2020-10-21svn: use correct variable name for short OIDLibravatar brian m. carlson1-1/+1
2020-10-21SKIP_DASHED_BUILT_INS: do not skip the bin/ programsLibravatar Johannes Schindelin1-9/+6
2020-10-21sequencer: remove duplicate rollback_lock_file() callLibravatar Elijah Newren1-1/+0
2020-10-21t7006: Use test_path_is_* functions in test scriptLibravatar Joey Salazar1-42/+42
2020-10-20apply: when -R, also reverse list of sectionsLibravatar Jonathan Tan3-2/+23
2020-10-20sideband: report unhandled incomplete sideband messages as bugsLibravatar Johannes Schindelin1-0/+3
2020-10-20sideband: avoid reporting incomplete sideband messagesLibravatar Johannes Schindelin3-1/+30
2020-10-20t7102,t7201: remove unnecessary blank spaces in test bodyLibravatar Charvi Mendiratta2-34/+0
2020-10-20t7101,t7102,t7201: modernize test formattingLibravatar Charvi Mendiratta3-65/+56
2020-10-20diff: add -I<regex> that ignores matching changesLibravatar Michał Kępień7-2/+221
2020-10-20merge-base, xdiff: zero out xpparam_t structuresLibravatar Michał Kępień3-0/+5