Merge branch 'jn/ancient-meld-support'

Junio C Hamano committed over 14 years ago

Merge branch 'jk/userdiff-config-simplify'

Junio C Hamano committed over 14 years ago

Sync with 1.7.9.1

Junio C Hamano committed over 14 years ago

Git 1.7.9.1

Junio C Hamano committed over 14 years ago

Merge branch 'jk/maint-tag-show-fixes' into maint

Junio C Hamano committed over 14 years ago

Merge branch 'bw/inet-pton-ntop-compat' into maint

Junio C Hamano committed over 14 years ago

Merge branch 'mp/make-cleanse-x-for-exe' into maint

Junio C Hamano committed over 14 years ago

Merge branch 'jn/merge-no-edit-fix' into maint

Junio C Hamano committed over 14 years ago

diff-highlight: document some non-optimal cases

Jeff King committed over 14 years ago

diff-highlight: match multi-line hunks

Jeff King committed over 14 years ago

diff-highlight: refactor to prepare for multi-line hunks

Jeff King committed over 14 years ago

diff-highlight: don't highlight whole lines

Jeff King committed over 14 years ago

diff-highlight: make perl strict and warnings fatal

Jeff King committed over 14 years ago

pager: find out the terminal width before spawning the pager

Zbigniew Jędrzejewski-Szmek committed over 14 years ago

do not override receive-pack errors

Clemens Buchacher committed over 14 years ago

t5541: check error message against the real port number used

Clemens Buchacher committed over 14 years ago

push/fetch/clone --no-progress suppresses progress output

Clemens Buchacher committed over 14 years ago

git rev-list: fix invalid typecast

Clemens Buchacher committed over 14 years ago

Sync with maint

Junio C Hamano committed over 14 years ago

Update draft release notes to 1.7.9.1

Junio C Hamano committed over 14 years ago