Merge v1.7.5-rc2 into jn/format-patch-doc

Junio C Hamano committed over 15 years ago

Documentation: describe the format of messages with inline patches

Jonathan Nieder committed over 15 years ago

Restructure documentation for git-merge-base.

Jonathan Nieder committed over 15 years ago

Documentation: update to git-merge-base --octopus

Vincent van Ravesteijn committed over 15 years ago

format-patch: wrap email addresses after long names

Jeff King committed over 15 years ago

i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811

Junio C Hamano committed over 15 years ago

i18n: use test_i18n{grep,cmp} in t7508

Junio C Hamano committed over 15 years ago

i18n: use test_i18ngrep in t7506

Junio C Hamano committed over 15 years ago

Merge branch 'maint'

Junio C Hamano committed over 15 years ago

contrib/completion: --notes, --no-notes

Michael J Gruber committed over 15 years ago

archive: document limitation of tar.umask config setting

René Scharfe committed over 15 years ago

log: convert to parse-options

Carlos Martín Nieto committed over 15 years ago

t3306,t5304: avoid clock skew issues

Michael J Gruber committed over 15 years ago

git.txt: fix list continuation

Michael J Gruber committed over 15 years ago

i18n: use test_i18ngrep and test_i18ncmp in t7502

Junio C Hamano committed over 15 years ago

i18n: use test_i18ngrep in t7501

Junio C Hamano committed over 15 years ago

i18n: use test_i18ncmp in t7500

Junio C Hamano committed over 15 years ago

i18n: use test_i18ngrep in t7201

Junio C Hamano committed over 15 years ago

i18n: use test_i18ncmp and test_i18ngrep in t7102 and t7110

Junio C Hamano committed over 15 years ago

i18n: use test_i18ncmp and test_i18ngrep in t5541, t6040, t6120, t7004, t7012 and t7060

Junio C Hamano committed over 15 years ago