Merge branch 'pw/patience-diff-clean-up'

Junio C Hamano committed over 5 years ago

Merge branch 'pw/word-diff-zero-width-matches'

Junio C Hamano committed over 5 years ago

ref-filter: introduce enum atom_type

ZheNing Hu committed over 5 years ago

ref-filter: add objectsize to used_atom

ZheNing Hu committed over 5 years ago

l10n: ru.po: fix typo in Russian translation

Alexey Roslyakov committed almost 6 years ago

t: avoid sed-based chain-linting in some expensive cases

Jeff King committed over 5 years ago

git-prompt: work under set -u

Elijah Newren committed over 5 years ago

stash show: fix segfault with --{include,only}-untracked

Denton Liu committed over 5 years ago

t3905: correct test title

Denton Liu committed over 5 years ago

dir: introduce readdir_skip_dot_and_dotdot() helper

Elijah Newren committed over 5 years ago

dir: update stale description of treat_directory()

Derrick Stolee committed over 5 years ago

dir: traverse into untracked directories if they may have ignored subfiles

Elijah Newren committed over 5 years ago

dir: avoid unnecessary traversal into ignored directory

Elijah Newren committed over 5 years ago

t3001, t7300: add testcase showcasing missed directory traversal

Elijah Newren committed over 5 years ago

t7300: add testcase showing unnecessary traversal into ignored directory

Elijah Newren committed over 5 years ago

ls-files: error out on -i unless -o or -c are specified

Elijah Newren committed over 5 years ago

dir: report number of visited directories and paths with trace2

Elijah Newren committed over 5 years ago

dir: convert trace calls to trace2 equivalents

Elijah Newren committed over 5 years ago

pretty: fix a typo in the documentation for %(trailers)

Louis Sautier committed over 5 years ago

Makefile: make PERL_DEFINES recursively expanded

Ævar Arnfjörð Bjarmason committed over 5 years ago