summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* config.c: Remove unused git_config_global() functionRamsay Jones2011-05-311-5/+0
* Merge branch 'jc/fmt-req-fix'Junio C Hamano2011-05-311-1/+1
|\
| * userformat_find_requirements(): find requirement for the correct formatJunio C Hamano2011-05-251-1/+1
* | Merge branch 'jk/maint-config-alias-fix'Junio C Hamano2011-05-314-45/+32
|\ \
| * | handle_options(): do not miscount how many arguments were usedJunio C Hamano2011-05-252-5/+3
| * | config: always parse GIT_CONFIG_PARAMETERS during git_configJeff King2011-05-252-40/+18
| * | git_config: don't peek at global config_parametersJeff King2011-05-251-4/+11
| * | config: make environment parsing routines staticJeff King2011-05-252-4/+2
* | | Merge branch 'maint'Junio C Hamano2011-05-306-8/+14
|\ \ \
| * \ \ Merge branch 'jm/maint-misc-fix' into maintJunio C Hamano2011-05-304-5/+11
| |\ \ \
| | * | | read_gitfile_gently: use ssize_t to hold read resultJeff King2011-05-261-1/+1
| | * | | remove tests of always-false conditionJim Meyering2011-05-262-2/+2
| | * | | rerere.c: diagnose a corrupt MERGE_RR when hitting EOF between TAB and '\0'Jim Meyering2011-05-261-2/+8
| * | | | Merge branch 'bc/maint-submodule-fix-parked' into maintJunio C Hamano2011-05-301-1/+1
| |\ \ \ \
| | * | | | git-submodule.sh: separate parens by a space to avoid confusing some shellsBrandon Casey2011-05-271-1/+1
| * | | | | Merge branch 'bc/maint-api-doc-parked' into maintJunio C Hamano2011-05-301-2/+2
| |\ \ \ \ \
| | * | | | | Documentation/technical/api-diff.txt: correct name of diff_unmerge()Brandon Casey2011-05-261-2/+2
| | |/ / / /
| * | | | | Merge branch 'jn/run-command-error-failure' into maintJunio C Hamano2011-05-303-6/+34
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'mk/grep-pcre'Junio C Hamano2011-05-3011-30/+347
|\ \ \ \ \ \ \
| * | | | | | | git-grep: Fix problems with recently added testsMichał Kiedrowicz2011-05-301-32/+26
| * | | | | | | git-grep: Update tests (mainly for -P)Michał Kiedrowicz2011-05-231-0/+85
| * | | | | | | Makefile: Pass USE_LIBPCRE down in GIT-BUILD-OPTIONSJunio C Hamano2011-05-161-0/+1
| * | | | | | | git-grep: update tests now regexp type is "last one wins"Junio C Hamano2011-05-161-16/+0
| * | | | | | | git-grep: do not die upon -F/-P when grep.extendedRegexp is set.Junio C Hamano2011-05-101-13/+43
| * | | | | | | git-grep: Bail out when -P is used with -F or -EMichał Kiedrowicz2011-05-102-1/+19
| * | | | | | | grep: Add basic testsMichał Kiedrowicz2011-05-103-0/+44
| * | | | | | | configure: Check for libpcreMichał Kiedrowicz2011-05-102-0/+41
| * | | | | | | git-grep: Learn PCREMichał Kiedrowicz2011-05-106-1/+107
| * | | | | | | grep: Extract compile_regexp_failed() from compile_regexp()Michał Kiedrowicz2011-05-101-9/+16
| * | | | | | | grep: Fix a typo in a commentMichał Kiedrowicz2011-05-101-1/+1
| * | | | | | | grep: Put calls to fixmatch() and regmatch() into patmatch()Michał Kiedrowicz2011-05-051-8/+15
| * | | | | | | contrib/completion: --line-number to git grepMichał Kiedrowicz2011-05-051-1/+1
| * | | | | | | Documentation: Add --line-number to git-grep synopsisMichał Kiedrowicz2011-05-051-1/+1
* | | | | | | | Merge branch 'jc/notes-batch-removal'Junio C Hamano2011-05-308-28/+151
|\ \ \ \ \ \ \ \
| * | | | | | | | show: --ignore-missingJunio C Hamano2011-05-195-3/+21
| * | | | | | | | notes remove: --stdin reads from the standard inputJunio C Hamano2011-05-193-5/+56
| * | | | | | | | notes remove: --ignore-missingJunio C Hamano2011-05-193-5/+35
| * | | | | | | | notes remove: allow removing more than oneJunio C Hamano2011-05-193-25/+49
* | | | | | | | | Merge branch 'jk/haves-from-alternate-odb'Junio C Hamano2011-05-308-63/+132
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | receive-pack: eliminate duplicate .have refsJeff King2011-05-203-3/+35
| * | | | | | | | | bisect: refactor sha1_array into a generic sha1 listJeff King2011-05-204-55/+78
| * | | | | | | | | refactor refs_from_alternate_cb to allow passing extra dataJeff King2011-05-204-6/+20
* | | | | | | | | | plug a DIR buffer leak in rerere.cJim Meyering2011-05-261-0/+1
* | | | | | | | | | Update 1.7.6 draft release notesJunio C Hamano2011-05-261-35/+15
* | | | | | | | | | Merge branch 'jn/userdiff-perl-updates'Junio C Hamano2011-05-263-38/+152
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | userdiff/perl: tighten BEGIN/END block pattern to reject here-doc delimitersJonathan Nieder2011-05-232-3/+16
| * | | | | | | | | | tests: make test_expect_code quieter on successJonathan Nieder2011-05-221-4/+3
| * | | | | | | | | | userdiff/perl: catch sub with brace on second lineJonathan Nieder2011-05-222-5/+40
| * | | | | | | | | | userdiff/perl: match full line of POD headersJonathan Nieder2011-05-222-1/+5
| * | | | | | | | | | userdiff/perl: anchor "sub" and "package" patterns on the leftJonathan Nieder2011-05-222-5/+58