Merge branch 'master' of git://github.com/git-l10n/git-po

Jiang Xin committed over 8 years ago

Makefile: make NO_ICONV really mean "no iconv"

Eric Sunshine committed over 8 years ago

tests: clean after SANITY tests

Junio C Hamano committed over 8 years ago

log: prevent error if line range ends past end of file

Isabella Stephens committed over 8 years ago

blame: prevent error if range ends past end of file

Isabella Stephens committed over 8 years ago

fetch-pack: introduce negotiator API

Jonathan Tan committed over 8 years ago

fetch-pack: move common check and marking together

Jonathan Tan committed over 8 years ago

fetch-pack: make negotiation-related vars local

Jonathan Tan committed over 8 years ago

fetch-pack: use ref adv. to prune "have" sent

Jonathan Tan committed over 8 years ago

fetch-pack: directly end negotiation if ACK ready

Jonathan Tan committed over 8 years ago

Merge branch 'master' of https://github.com/vnwildman/git

Jiang Xin committed over 8 years ago

submodule: unset core.worktree if no working tree is present

Stefan Beller committed over 8 years ago

t5526: test recursive submodules when fetching moved submodules

Stefan Beller committed over 8 years ago

submodule: fix NULL correctness in renamed broken submodules

Stefan Beller committed over 8 years ago

fetch-pack: clear marks before re-marking

Jonathan Tan committed over 8 years ago

fetch-pack: split up everything_local()

Jonathan Tan committed over 8 years ago

doc: update the order of the syntax `git merge --continue`

Meng-Sung Wu committed over 8 years ago

blame: release string_list after use in parse_color_fields()

René Scharfe committed over 8 years ago

merge-recursive: use xstrdup() instead of fixed buffer

René Scharfe committed over 8 years ago

l10n: vi.po(3608t): Update Vietnamese translation for v2.18.0 round2

Tran Ngoc Quan committed over 8 years ago