Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add a setting to require a filter to be successfuljb/required-filter | Jehan Bing | 2012-02-17 | 3 | -14/+92 |
* | Merge branch 'jk/git-dir-lookup' | Junio C Hamano | 2012-02-14 | 5 | -5/+109 |
|\ | |||||
| * | standardize and improve lookup rules for external local reposjk/git-dir-lookup | Jeff King | 2012-02-02 | 5 | -5/+109 |
* | | Merge branch 'jk/grep-binary-attribute' | Junio C Hamano | 2012-02-14 | 5 | -192/+308 |
|\ \ | |||||
| * | | grep: pre-load userdiff drivers when threadedjk/grep-binary-attribute | Jeff King | 2012-02-02 | 1 | -4/+6 |
| * | | grep: load file data after checking binary-ness | Jeff King | 2012-02-02 | 1 | -3/+3 |
| * | | grep: respect diff attributes for binary-ness | Jeff King | 2012-02-02 | 3 | -2/+39 |
| * | | grep: cache userdiff_driver in grep_source | Jeff King | 2012-02-02 | 2 | -6/+20 |
| * | | grep: drop grep_buffer's "name" parameter | Jeff King | 2012-02-02 | 3 | -4/+3 |
| * | | convert git-grep to use grep_source interface | Jeff King | 2012-02-02 | 1 | -119/+23 |
| * | | grep: refactor the concept of "grep source" into an object | Jeff King | 2012-02-02 | 2 | -34/+186 |
| * | | grep: move sha1-reading mutex into low-level code | Jeff King | 2012-02-02 | 3 | -23/+29 |
| * | | grep: make locking flag global | Jeff King | 2012-02-02 | 3 | -11/+13 |
* | | | Merge branch 'nd/pack-objects-parseopt' | Junio C Hamano | 2012-02-14 | 3 | -190/+148 |
|\ \ \ | |||||
| * | | | pack-objects: convert to use parse_options()nd/pack-objects-parseopt | Nguyễn Thái Ngọc Duy | 2012-02-01 | 1 | -176/+139 |
| * | | | pack-objects: remove bogus comment | Nguyễn Thái Ngọc Duy | 2012-02-01 | 2 | -14/+5 |
| * | | | pack-objects: do not accept "--index-version=version," | Nguyễn Thái Ngọc Duy | 2012-02-01 | 2 | -1/+5 |
| |/ / | |||||
* | | | Merge branch 'dp/i18n-libcharset' | Junio C Hamano | 2012-02-14 | 3 | -0/+16 |
|\ \ \ | |||||
| * | | | Makefile: introduce CHARSET_LIB to link with -lcharsetdp/i18n-libcharset | Дилян Палаузов | 2012-02-13 | 3 | -0/+16 |
| |/ / | |||||
* | | | Merge branch 'mh/war-on-extra-refs' | Junio C Hamano | 2012-02-14 | 5 | -75/+64 |
|\ \ \ | |||||
| * | | | refs: remove the extra_refs APImh/war-on-extra-refs | Michael Haggerty | 2012-02-12 | 2 | -30/+1 |
| * | | | clone: do not add alternate references to extra_refs | Michael Haggerty | 2012-02-12 | 1 | -12/+0 |
| * | | | everything_local(): mark alternate refs as complete | Michael Haggerty | 2012-02-12 | 2 | -1/+7 |
| * | | | fetch-pack.c: inline insert_alternate_refs() | Michael Haggerty | 2012-02-12 | 1 | -6/+1 |
| * | | | fetch-pack.c: rename some parameters from "path" to "refname" | Michael Haggerty | 2012-02-12 | 1 | -5/+5 |
| * | | | clone.c: move more code into the "if (refs)" conditional | Michael Haggerty | 2012-02-12 | 1 | -19/+20 |
| * | | | t5700: document a failure of alternates to affect fetch | Michael Haggerty | 2012-02-12 | 1 | -3/+31 |
* | | | | Merge branch 'lt/pull-no-edit' | Junio C Hamano | 2012-02-14 | 1 | -2/+6 |
|\ \ \ \ | |||||
| * | | | | "git pull" doesn't know "--edit"lt/pull-no-edit | Linus Torvalds | 2012-02-12 | 1 | -2/+6 |
* | | | | | Merge branch 'bl/gitweb-project-filter' | Junio C Hamano | 2012-02-14 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | gitweb: Harden and improve $project_filter page titlebl/gitweb-project-filter | Jakub Narebski | 2012-02-12 | 1 | -1/+1 |
* | | | | | | Merge branch 'jn/ancient-meld-support' | Junio C Hamano | 2012-02-14 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | mergetools/meld: Use --help output to detect --output supportjn/ancient-meld-support | Jonathan Nieder | 2012-02-10 | 1 | -1/+1 |
* | | | | | | | Merge branch 'jk/userdiff-config-simplify' | Junio C Hamano | 2012-02-14 | 5 | -37/+12 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | drop odd return value semantics from userdiff_configjk/userdiff-config-simplify | Jeff King | 2012-02-07 | 5 | -37/+12 |
* | | | | | | | | Sync with 1.7.9.1 | Junio C Hamano | 2012-02-14 | 3 | -7/+13 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Git 1.7.9.1v1.7.9.1 | Junio C Hamano | 2012-02-14 | 3 | -2/+14 |
| * | | | | | | | | Merge branch 'jk/maint-tag-show-fixes' into maint | Junio C Hamano | 2012-02-13 | 2 | -32/+53 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'bw/inet-pton-ntop-compat' into maint | Junio C Hamano | 2012-02-13 | 2 | -12/+0 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'mp/make-cleanse-x-for-exe' into maint | Junio C Hamano | 2012-02-13 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jn/merge-no-edit-fix' into maint | Junio C Hamano | 2012-02-13 | 2 | -3/+19 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ | Sync with maint | Junio C Hamano | 2012-02-13 | 12 | -169/+32 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | Update draft release notes to 1.7.9.1 | Junio C Hamano | 2012-02-13 | 1 | -3/+19 |
| * | | | | | | | | | | | | Merge branch 'js/add-e-submodule-fix' into maint | Junio C Hamano | 2012-02-13 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/parse-date-raw' into maint | Junio C Hamano | 2012-02-13 | 4 | -1/+60 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/merge-ff-only-stronger-than-signed-merge' into maint | Junio C Hamano | 2012-02-13 | 2 | -1/+15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/branch-desc-typoavoidance' into maint | Junio C Hamano | 2012-02-13 | 3 | -4/+61 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jn/rpm-spec' into maint | Junio C Hamano | 2012-02-13 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | t: use sane_unset instead of unset | Ævar Arnfjörð Bjarmason | 2012-02-13 | 6 | -10/+10 |
| * | | | | | | | | | | | | | | | | | Remove Git's support for smoke testing | Ævar Arnfjörð Bjarmason | 2012-02-13 | 3 | -133/+1 |