Merge branch 'jk/filter-process-fix'

Junio C Hamano committed almost 10 years ago

Merge branch 'ls/filter-process'

Junio C Hamano committed almost 10 years ago

t6026-merge-attr: ensure that the merge driver was called

Andreas Schwab committed almost 10 years ago

travis-ci: disable GIT_TEST_HTTPD for macOS

Lars Schneider committed almost 10 years ago

Makefile: set NO_OPENSSL on macOS by default

Lars Schneider committed almost 10 years ago

create_branch: drop unused "head" parameter

Jeff King committed almost 10 years ago

Merge branch 'fr_v2.11.0_rnd1' of git://github.com/jnavila/git

Jiang Xin committed almost 10 years ago

sequencer: silence -Wtautological-constant-out-of-range-compare

Jeff King committed almost 10 years ago

t6026-merge-attr: don't fail if sleep exits early

Andreas Schwab committed almost 10 years ago

alternates: re-allow relative paths from environment

Jeff King committed almost 10 years ago

t0021: compute file size with a single process instead of a pipeline

Johannes Sixt committed almost 10 years ago

t0021: expect more variations in the output of uniq -c

Johannes Sixt committed almost 10 years ago

l10n: fr.po fix grammar mistakes

jfbu committed almost 10 years ago

l10n: fr.po v2.11.0_rnd1

Jean-Noel Avila committed almost 10 years ago

l10n: sv.po: Update Swedish translation (2913t0f0u)

Peter Krefting committed almost 10 years ago

Merge branch 'ko/merge-l10n' of https://github.com/changwoo/git-l10n-ko

Jiang Xin committed almost 10 years ago

l10n: vi.po: Updated translation to v2.11.0 (2913t)

Tran Ngoc Quan committed almost 10 years ago

l10n: ko.po: Update Korean translation

Changwoo Ryu committed almost 10 years ago

t0021: fix filehandle usage on older perl

Jeff King committed almost 10 years ago

t0021: use $PERL_PATH for rot13-filter.pl

Jeff King committed almost 10 years ago