Merge branch 'jk/log-decorate-opts-with-implicit-decorate'

Junio C Hamano committed over 4 years ago

Merge branch 'en/rebase-x-wo-git-dir-env'

Junio C Hamano committed over 4 years ago

Merge branch 'jc/c99-var-decl-in-for-loop'

Junio C Hamano committed over 4 years ago

Merge branch 'pw/xdiff-classify-record-in-histogram'

Junio C Hamano committed over 4 years ago

l10n: README: call more attention to plural strings

Josh Steadmon committed over 4 years ago

fast-export: fix surprising behavior with --first-parent

William Sprent committed over 4 years ago

config: require lowercase for branch.*.autosetupmerge

Josh Steadmon committed over 4 years ago

branch: add flags and config to inherit tracking

Josh Steadmon committed over 4 years ago

branch: accept multiple upstream branches for tracking

Josh Steadmon committed over 4 years ago

merge: allow to pretend a merge is made into a different branch

Junio C Hamano committed over 4 years ago

git-p4: show progress as an integer

Joel Holdsworth committed over 4 years ago

git-p4: print size values in appropriate units

Joel Holdsworth committed over 4 years ago

grep/pcre2: factor out literal variable

René Scharfe committed over 4 years ago

grep/pcre2: use PCRE2_UTF even with ASCII patterns

René Scharfe committed over 4 years ago

daemon: plug memory leak on overlong path

René Scharfe committed over 4 years ago

git-apply: skip threeway in add / rename cases

Jerry Zhang committed over 4 years ago

repack: make '--quiet' disable progress

Derrick Stolee committed over 4 years ago

repack: respect kept objects with '--write-midx -b'

Derrick Stolee committed over 4 years ago

t4202: fix patternType setting in --invert-grep test

René Scharfe committed over 4 years ago

docs: add missing colon to Documentation/config/gpg.txt

Greg Hurrell committed over 4 years ago