Merge branch 'jn/maint-request-pull' into jn/request-pull

Junio C Hamano committed over 16 years ago

t5150: protect backslash with backslash in shell

Junio C Hamano committed over 16 years ago

Use 'git merge -Xsubtree' when git version >= 1.7.0.

Pelle Wessman committed over 16 years ago

blame-options.txt: Add default value for `-M/-C` options.

Bo Yang committed over 16 years ago

Make git log --follow find copies among unmodified files.

Bo Yang committed over 16 years ago

Make diffcore_std only can run once before a diff_flush

Bo Yang committed over 16 years ago

Add a macro DIFF_QUEUE_CLEAR.

Bo Yang committed over 16 years ago

wt-status: take advice.statusHints seriously

Michael J Gruber committed over 16 years ago

t7508: test advice.statusHints

Michael J Gruber committed over 16 years ago

test-lib: some shells do not let $? propagate into an eval

Jonathan Nieder committed over 16 years ago

pretty: Respect --abbrev option

Will Palmer committed over 16 years ago

shortlog: Document and test --format option

Jonathan Nieder committed over 16 years ago

t4201 (shortlog): Test output format with multiple authors

Jonathan Nieder committed over 16 years ago

t4201 (shortlog): guard setup with test_expect_success

Jonathan Nieder committed over 16 years ago

Documentation/shortlog: scripted users should not rely on implicit HEAD

Jonathan Nieder committed over 16 years ago

commit --amend: cope with missing display name

Jonathan Nieder committed over 16 years ago

test-lib: Let tests specify commands to be run at end of test

Jonathan Nieder committed over 16 years ago

Merge branch 'maint-1.7.0' into maint

Junio C Hamano committed over 16 years ago

remove ecb parameter from xdi_diff_outf()

René Scharfe committed over 16 years ago

Documentation/git-send-email: Add "Use gmail as the smtp server"

Ping Yin committed over 16 years ago