Almost 1.7.11.6

Junio C Hamano committed about 14 years ago

Merge branch 'mg/rebase-i-onto-reflog-in-full' into maint-1.7.11

Junio C Hamano committed about 14 years ago

Merge branch 'jc/maint-protect-sh-from-ifs' into maint-1.7.11

Junio C Hamano committed about 14 years ago

Merge branch 'bc/receive-pack-stdout-protection' into maint-1.7.11

Junio C Hamano committed about 14 years ago

Merge branch 'jk/maint-null-in-trees' into maint-1.7.11

Junio C Hamano committed about 14 years ago

Merge branch 'tr/maint-send-email-2047' into maint-1.7.11

Junio C Hamano committed about 14 years ago

Merge branch 'mm/die-with-dashdash-help' into maint-1.7.11

Junio C Hamano committed about 14 years ago

Merge branch 'js/gitweb-path-info-unquote' into maint-1.7.11

Junio C Hamano committed about 14 years ago

gitcli: contrast wildcard given to shell and to git

Junio C Hamano committed about 14 years ago

gitcli: formatting fix

Junio C Hamano committed about 14 years ago

t0060: split absolute path test in two to exercise some of it on Windows

Johannes Sixt committed about 14 years ago

mailinfo: strip "RE: " prefix

Junio C Hamano committed about 14 years ago

attr: "binary" attribute should choose built-in "binary" merge driver

Junio C Hamano committed about 14 years ago

merge: teach -Xours/-Xtheirs to binary ll-merge driver

Junio C Hamano committed about 14 years ago

Document MKDIR_WO_TRAILING_SLASH in Makefile

Joachim Schmitz committed about 14 years ago

Add a no-op setitimer() wrapper

Joachim Schmitz committed about 14 years ago

gitk: Rename 'tagcontents' to 'cached_tagcontent'

David Aguilar committed about 14 years ago

gitk: Teach "Reread references" to reload tags

David Aguilar committed about 14 years ago

l10n: vi.po: update to v1.7.12-146-g16d26

Tran Ngoc Quan committed about 14 years ago

The fourth batch for 1.8.0

Junio C Hamano committed about 14 years ago