Merge branch '2.15.1' of https://github.com/ChrisADR/git-po into maint

Jiang Xin committed almost 9 years ago

progress: drop delay-threshold code

Lars Schneider committed almost 9 years ago

progress: set default delay threshold to 100%, not 0%

Jeff King committed almost 9 years ago

l10n: Update Spanish translation

Christopher Díaz Riveros committed almost 9 years ago

sha1_file: use strbuf_add() instead of strbuf_addf()

Derrick Stolee committed almost 9 years ago

refactor "dumb" terminal determination

Lars Schneider committed almost 9 years ago

rebase -i: set commit to null in exec commands

Liam Beguin committed almost 9 years ago

Documentation: use preferred name for the 'todo list' script

Liam Beguin committed almost 9 years ago

Documentation: move rebase.* configs to new file

Liam Beguin committed almost 9 years ago

print_sha1_ellipsis: introduce helper

Ann T Ropea committed almost 9 years ago

Documentation: user-manual: limit usage of ellipsis

Ann T Ropea committed almost 9 years ago

Documentation: revisions: fix typo: "three dot" ---> "three-dot" (in line with "two-dot").

Ann T Ropea committed almost 9 years ago

diffcore-rename: make diff-tree -l0 mean -l<large>

Jonathan Tan committed almost 9 years ago

l10n: zh_CN translate parameter name

Fangyi Zhou committed almost 9 years ago

l10n: zh_CN Fix typo

Zhou Fangyi committed almost 9 years ago

Sync with v2.15.1

Junio C Hamano committed almost 9 years ago

RelNotes: the seventh batch

Junio C Hamano committed almost 9 years ago

Merge branch 'rs/include-comments-before-the-function-header'

Junio C Hamano committed almost 9 years ago

Merge branch 'ma/branch-list-paginate'

Junio C Hamano committed almost 9 years ago

Merge branch 'jc/branch-name-sanity'

Junio C Hamano committed almost 9 years ago