summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/maint-avoid-streaming-filtered-contents'Junio C Hamano2012-02-264-9/+125
|\
| * do not stream large files to pack when filters are in usejk/maint-avoid-streaming-filtered-contentsJeff King2012-02-242-5/+95
| * teach dry-run convert_to_git not to require a src bufferJeff King2012-02-241-2/+10
| * teach convert_to_git a "dry run" modeJeff King2012-02-242-2/+20
* | Merge branch 'jb/filter-ignore-sigpipe'Junio C Hamano2012-02-261-0/+5
|\ \
| * | Ignore SIGPIPE when running a filter driverjb/filter-ignore-sigpipeJehan Bing2012-02-211-0/+5
| |/
* | pack-objects: Fix compilation with NO_PTHREDSMichał Kiedrowicz2012-02-261-1/+1
* | Merge branch 'maint'Junio C Hamano2012-02-2612-72/+291
|\ \
| * | Document accumulated fixes since 1.7.9.2Junio C Hamano2012-02-262-1/+18
| * | Merge branch 'jc/add-refresh-unmerged' into maintJunio C Hamano2012-02-262-2/+24
| |\ \
| * \ \ Merge branch 'js/configure-libintl' into maintJunio C Hamano2012-02-261-8/+12
| |\ \ \
| * \ \ \ Sync with 1.7.8.5Junio C Hamano2012-02-266-6/+39
| |\ \ \ \
| | * | | | Git 1.7.8.5v1.7.8.5Junio C Hamano2012-02-263-2/+21
| | * | | | grep -P: Fix matching ^ and $Michał Kiedrowicz2012-02-261-1/+1
| | * | | | am: don't infloop for an empty input fileJim Meyering2012-02-262-1/+11
| | * | | | rebase -m: only call "notes copy" when rewritten exists and is non-emptyAndrew Wong2012-02-261-4/+7
| | * | | | Makefile: add thread-utils.h to LIB_HDmitry V. Levin2012-02-261-0/+1
| | | |_|/ | | |/| |
| * | | | git-p4: remove bash-ism in t9800Pete Wyckoff2012-02-261-9/+15
| * | | | git-p4: remove bash-ism in t9809Pete Wyckoff2012-02-261-1/+1
| * | | | git-p4: fix submit regression with clientSpec and subdir clonePete Wyckoff2012-02-262-43/+185
| * | | | git-p4: set useClientSpec variable on initial clonePete Wyckoff2012-02-263-4/+34
* | | | | Update draft release notes to 1.7.10Junio C Hamano2012-02-231-1/+24
* | | | | Merge branch 'ld/git-p4-expanded-keywords'Junio C Hamano2012-02-233-10/+501
|\ \ \ \ \
| * | | | | git-p4: add initial support for RCS keywordsld/git-p4-expanded-keywordsLuke Diamand2012-02-233-10/+501
* | | | | | Merge branch 'jk/config-include'Junio C Hamano2012-02-238-60/+495
|\ \ \ \ \ \
| * | | | | | config: add include directiveJeff King2012-02-177-14/+292
| * | | | | | config: eliminate config_exclusive_filenameJeff King2012-02-172-9/+3
| * | | | | | config: stop using config_exclusive_filenameJeff King2012-02-172-24/+60
| * | | | | | config: provide a version of git_config with more optionsJeff King2012-02-173-4/+27
| * | | | | | config: teach git_config_rename_section a file argumentJeff King2012-02-172-7/+14
| * | | | | | config: teach git_config_set_multivar_in_file a default pathJeff King2012-02-171-13/+7
| * | | | | | config: copy the return value of prefix_filenameJeff King2012-02-171-3/+4
| * | | | | | t1300: add missing &&-chainingJeff King2012-02-171-1/+1
| * | | | | | docs/api-config: minor clarificationsJeff King2012-02-171-7/+8
| * | | | | | docs: add a basic description of the config APIJeff King2012-02-061-0/+101
* | | | | | | Merge branch 'jc/add-refresh-unmerged'Junio C Hamano2012-02-232-2/+24
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | refresh_index: do not show unmerged path that is outside pathspecjc/add-refresh-unmergedJunio C Hamano2012-02-172-2/+24
* | | | | | | Merge branch 'js/configure-libintl'Junio C Hamano2012-02-231-8/+12
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | configure: don't use -lintl when there is no gettext supportjs/configure-libintlJohn Szakmeister2012-02-201-8/+12
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'pj/remote-set-branches-usage-fix'Junio C Hamano2012-02-232-2/+2
|\ \ \ \ \ \
| * | | | | | remote: fix set-branches usage and documentationpj/remote-set-branches-usage-fixPhilip Jägenstedt2012-02-192-2/+2
* | | | | | | Merge branch 'tr/perftest'Junio C Hamano2012-02-2314-552/+1363
|\ \ \ \ \ \ \
| * | | | | | | Add a performance test for git-greptr/perftestThomas Rast2012-02-171-0/+23
| * | | | | | | Introduce a performance testing frameworkThomas Rast2012-02-1712-5/+774
| * | | | | | | Move the user-facing test library to test-lib-functions.shThomas Rast2012-02-172-549/+568
* | | | | | | | Merge branch 'maint'Junio C Hamano2012-02-232-4/+11
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | README: point to Documentation/SubmittingPatchesMatthieu Moy2012-02-231-4/+6
| * | | | | | | Document merge.branchdesc configuration variableJunio C Hamano2012-02-231-0/+5
* | | | | | | | merge: do not trust fstat(2) too much when checking interactivenessJunio C Hamano2012-02-231-1/+1
* | | | | | | | Sync with 1.7.9.2Junio C Hamano2012-02-222-17/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / /