completion: zsh: fix __gitcomp_direct()
Felipe Contreras committed almost 6 years ago
Junio C Hamano committed almost 6 years ago
Merge branch 'cc/doc-filter-branch-typofix'
Junio C Hamano committed almost 6 years ago
Merge branch 'jk/committer-date-is-author-date-fix'
Junio C Hamano committed almost 6 years ago
t6423: add more details about direct resolution of directories
Elijah Newren committed almost 6 years ago
t6423: note improved ort handling with untracked files
Elijah Newren committed almost 6 years ago
t6423, t6436: note improved ort handling with dirty files
Elijah Newren committed almost 6 years ago
merge tests: expect slight differences in output for recursive vs. ort
Elijah Newren committed almost 6 years ago
t6423: expect improved conflict markers labels in the ort backend
Elijah Newren committed almost 6 years ago
t6404, t6423: expect improved rename/delete handling in ort backend
Elijah Newren committed almost 6 years ago
t6416: correct expectation for rename/rename(1to2) + directory/file
Elijah Newren committed almost 6 years ago
merge tests: expect improved directory/file conflict handling in ort
Elijah Newren committed almost 6 years ago
t/: new helper for tests that pass with ort but fail with recursive
Elijah Newren committed almost 6 years ago
am, sequencer: stop parsing our own committer ident
Jeff King committed almost 6 years ago
t1400: prepare for `main` being default branch name
Johannes Schindelin committed almost 6 years ago
tests: prepare aligned mentions of the default branch name
Johannes Schindelin committed almost 6 years ago
t9902: prepare a test for the upcoming default branch name
Johannes Schindelin committed almost 6 years ago
t3200: prepare for `main` being shorter than `master`
Johannes Schindelin committed almost 6 years ago
t5703: adjust a test case for the upcoming default branch name
Johannes Schindelin committed almost 6 years ago
t6200: adjust suppression pattern to also match "main"
Johannes Schindelin committed almost 6 years ago