Merge branch 'ls/t0021-fixup'

Junio C Hamano committed almost 10 years ago

Merge branch 'ah/grammos'

Junio C Hamano committed almost 10 years ago

Merge branch 'jc/renormalize-merge-kill-safer-crlf'

Junio C Hamano committed almost 10 years ago

Merge branch 'jt/use-trailer-api-in-commands'

Junio C Hamano committed almost 10 years ago

git-p4: fix multi-path changelist empty commits

George Vanburgh committed almost 10 years ago

git-p4: avoid crash adding symlinked directory

Luke Diamand committed almost 10 years ago

t0021: fix flaky test

Lars Schneider committed almost 10 years ago

First batch for 2.12

Junio C Hamano committed almost 10 years ago

Merge branch 'ls/p4-retry-thrice'

Junio C Hamano committed almost 10 years ago

Merge branch 'ls/p4-empty-file-on-lfs'

Junio C Hamano committed almost 10 years ago

Merge branch 'ld/p4-update-shelve'

Junio C Hamano committed almost 10 years ago

Merge branch 'vk/p4-submit-shelve'

Junio C Hamano committed almost 10 years ago

Merge branch 'da/mergetool-trust-exit-code'

Junio C Hamano committed almost 10 years ago

Merge branch 'ak/lazy-prereq-mktemp'

Junio C Hamano committed almost 10 years ago

Merge branch 'nd/worktree-list-fixup'

Junio C Hamano committed almost 10 years ago

Merge branch 'nd/qsort-in-merge-recursive'

Junio C Hamano committed almost 10 years ago

Merge branch 'bw/push-dry-run'

Junio C Hamano committed almost 10 years ago

Merge branch 'hv/submodule-not-yet-pushed-fix'

Junio C Hamano committed almost 10 years ago

Merge branch 'dt/empty-submodule-in-merge'

Junio C Hamano committed almost 10 years ago

Merge branch 'jk/rev-parse-symbolic-parents-fix'

Junio C Hamano committed almost 10 years ago