Merge branch 'jl/maint-diff-ignore-submodules'

Junio C Hamano committed over 16 years ago

Add test for correct coloring of git log --decoration

Nazri Ramliy committed over 16 years ago

Sync with 1.7.1.1

Junio C Hamano committed over 16 years ago

revert: do not rebuild argv on heap

Jonathan Nieder committed over 16 years ago

Merge commit 'v1.7.2-rc0~6^2' into cc/cherry-pick-stdin

Junio C Hamano committed over 16 years ago

Git 1.7.1.1

Junio C Hamano committed over 16 years ago

t/t9700/test.pl: don't access private object members, use public access methods

Brandon Casey committed over 16 years ago

t/t9001: use egrep when regular expressions are involved

Brandon Casey committed over 16 years ago

git-rev-parse.txt: Add more examples for caret and colon

Michael J Gruber committed over 16 years ago

Merge branch 'maint'

Junio C Hamano committed over 16 years ago

Update draft release notes to 1.7.1.1

Junio C Hamano committed over 16 years ago

Merge branch 'tr/send-email-8bit' into maint

Junio C Hamano committed over 16 years ago

Merge branch 'pb/maint-perl-errmsg-no-dir' into maint

Junio C Hamano committed over 16 years ago

Merge branch 'js/maint-am-rebase-invalid-author' into maint

Junio C Hamano committed over 16 years ago

Merge branch 'jc/maint-simpler-common-prefix' into maint

Junio C Hamano committed over 16 years ago

Merge branch 'bd/maint-unpack-trees-parawalk-fix' into maint

Junio C Hamano committed over 16 years ago

git --paginate: do not commit pager choice too early

Nguyễn Thái Ngọc Duy committed over 16 years ago

tests: local config file should be honored from subdirs of toplevel

Jonathan Nieder committed over 16 years ago

t7006: test pager configuration for several git commands

Jonathan Nieder committed over 16 years ago

t7006 (pager): introduce helper for parameterized tests

Jonathan Nieder committed over 16 years ago