Merge branch 'mh/diff-indent-heuristic'

Junio C Hamano committed almost 10 years ago

Merge branch 'rs/c-auto-resets-attributes'

Junio C Hamano committed almost 10 years ago

Merge branch 'mm/config-color-ui-default-to-auto'

Junio C Hamano committed almost 10 years ago

Merge branch 'rs/cocci'

Junio C Hamano committed almost 10 years ago

get_short_sha1: list ambiguous objects on error

Jeff King committed almost 10 years ago

for_each_abbrev: drop duplicate objects

Jeff King committed almost 10 years ago

sha1_array: let callbacks interrupt iteration

Jeff King committed almost 10 years ago

get_short_sha1: mark ambiguity error for translation

Jeff King committed almost 10 years ago

get_short_sha1: NUL-terminate hex prefix

Jeff King committed almost 10 years ago

get_short_sha1: refactor init of disambiguation code

Jeff King committed almost 10 years ago

get_short_sha1: parse tags when looking for treeish

Jeff King committed almost 10 years ago

get_sha1: propagate flags to child functions

Jeff King committed almost 10 years ago

get_sha1: avoid repeating ourselves via ONLY_TO_DIE

Jeff King committed almost 10 years ago

get_sha1: detect buggy calls with multiple disambiguators

Jeff King committed almost 10 years ago

unpack_sha1_header(): detect malformed object header

Junio C Hamano committed almost 10 years ago

streaming: make sure to notice corrupt object

Junio C Hamano committed almost 10 years ago

Merge branch 'va/i18n' of ../git-gui into va/git-gui-i18n

Junio C Hamano committed almost 10 years ago

git-gui: l10n: add Portuguese translation

Vasco Almeida committed over 10 years ago

git-gui i18n: mark strings for translation

Vasco Almeida committed over 10 years ago

Merge branch 'rs/use-modern-git-merge-syntax' of git-gui into rs/git-gui-use-modern-git-merge-syntax

Junio C Hamano committed almost 10 years ago