Merge branch 'maint'

Junio C Hamano committed over 14 years ago

Update draft release notes to 1.7.9.2

Junio C Hamano committed over 14 years ago

configure: don't use -lintl when there is no gettext support

John Szakmeister committed over 14 years ago

remote: fix set-branches usage and documentation

Philip Jägenstedt committed over 14 years ago

gitweb: Fix 'grep' search for multiple matches in file

Jakub Narebski committed over 14 years ago

xdiff: PATIENCE/HISTOGRAM are not independent option bits

Junio C Hamano committed over 14 years ago

xdiff: remove XDL_PATCH_* macros

Junio C Hamano committed over 14 years ago

refresh_index: do not show unmerged path that is outside pathspec

Junio C Hamano committed over 14 years ago

gitweb: Fix "heads" view when there is no current branch

Jakub Narebski committed over 14 years ago

Add a performance test for git-grep

Thomas Rast committed over 14 years ago

Introduce a performance testing framework

Thomas Rast committed over 14 years ago

Move the user-facing test library to test-lib-functions.sh

Thomas Rast committed over 14 years ago

config: add include directive

Jeff King committed over 14 years ago

config: eliminate config_exclusive_filename

Jeff King committed over 14 years ago

config: stop using config_exclusive_filename

Jeff King committed over 14 years ago

config: provide a version of git_config with more options

Jeff King committed over 14 years ago

config: teach git_config_rename_section a file argument

Jeff King committed over 14 years ago

config: teach git_config_set_multivar_in_file a default path

Jeff King committed over 14 years ago

config: copy the return value of prefix_filename

Jeff King committed over 14 years ago

t1300: add missing &&-chaining

Jeff King committed over 14 years ago