summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | fetch-pack: move code to report unmatched refs to a functionMatt McCutchen2017-03-024-9/+23
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'jk/interpret-branch-name' into maintJunio C Hamano2017-03-2810-51/+249
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | checkout: restrict @-expansions when finding branchjk/interpret-branch-nameJeff King2017-03-022-1/+11
| * | | | | | | | | | | | strbuf_check_ref_format(): expand only local branchesJeff King2017-03-022-3/+3
| * | | | | | | | | | | | branch: restrict @-expansions when deletingJeff King2017-03-022-4/+7
| * | | | | | | | | | | | t3204: test git-branch @-expansion corner casesJeff King2017-03-021-0/+123
| * | | | | | | | | | | | interpret_branch_name: allow callers to restrict expansionsJeff King2017-03-028-28/+69
| * | | | | | | | | | | | strbuf_branchname: add docstringJeff King2017-03-021-0/+15
| * | | | | | | | | | | | strbuf_branchname: drop return valueJeff King2017-03-022-5/+2
| * | | | | | | | | | | | interpret_branch_name: move docstring to header fileJeff King2017-03-022-21/+21
| * | | | | | | | | | | | interpret_branch_name(): handle auto-namelen for @{-1}Jeff King2017-03-022-1/+10
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'ab/cond-skip-tests' into maintJunio C Hamano2017-03-283-1/+16
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | gitweb tests: skip tests when we don't have Time::HiResab/cond-skip-testsÆvar Arnfjörð Bjarmason2017-03-011-0/+5
| * | | | | | | | | | | | gitweb tests: change confusing "skip_all" phrasingÆvar Arnfjörð Bjarmason2017-03-011-1/+1
| * | | | | | | | | | | | cvs tests: skip tests that call "cvs commit" when running as rootÆvar Arnfjörð Bjarmason2017-02-272-0/+10
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'jk/ident-empty' into maintJunio C Hamano2017-03-282-19/+66
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | ident: do not ignore empty config name/emailjk/ident-emptyJeff King2017-02-232-2/+13
| * | | | | | | | | | | | ident: reject all-crud ident nameJeff King2017-02-232-0/+16
| * | | | | | | | | | | | ident: handle NULL email when complaining of empty nameJeff King2017-02-232-13/+33
| * | | | | | | | | | | | ident: mark error messages for translationJeff King2017-02-231-6/+6
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'jk/delta-chain-limit' into maintJunio C Hamano2017-03-283-23/+207
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | pack-objects: convert recursion to iteration in break_delta_chain()jk/delta-chain-limitJeff King2017-01-271-30/+99
| * | | | | | | | | | | | pack-objects: enforce --depth limit in reused deltasJeff King2017-01-273-0/+115
* | | | | | | | | | | | | Merge branch 'sg/test-with-stdin' into maintJunio C Hamano2017-03-282-8/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | tests: make the 'test_pause' helper work in non-verbose modesg/test-with-stdinSZEDER Gábor2017-03-181-7/+2
| * | | | | | | | | | | | | tests: create an interactive gdb session with the 'debug' helperSZEDER Gábor2017-03-182-1/+2
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jk/interop-test' into maintJunio C Hamano2017-03-288-1/+270
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t/interop: add test of old clients against modern git-daemonjk/interop-testJeff King2017-03-102-1/+43
| * | | | | | | | | | | | | t: add an interoperability test harnessJeff King2017-03-106-0/+227
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jt/perf-updates' into maintJunio C Hamano2017-03-283-3/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t/perf: add fallback for pre-bin-wrappers versions of gitjt/perf-updatesJeff King2017-03-031-0/+3
| * | | | | | | | | | | | | t/perf: use $MODERN_GIT for all repo-copying stepsJeff King2017-03-031-2/+2
| * | | | | | | | | | | | | t/perf: export variable used in other blocksJonathan Tan2017-03-031-1/+2
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'rs/strbuf-add-real-path' into maintJunio C Hamano2017-03-286-2/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | strbuf: add strbuf_add_real_path()rs/strbuf-add-real-pathRené Scharfe2017-02-274-1/+32
| * | | | | | | | | | | | | cocci: use ALLOC_ARRAYRené Scharfe2017-02-272-1/+17
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jk/parse-config-key-cleanup' into maintJunio C Hamano2017-03-283-10/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | parse_hide_refs_config: tell parse_config_key we don't want a subsectionjk/parse-config-key-cleanupJeff King2017-02-241-4/+3
| * | | | | | | | | | | | | parse_config_key: allow matching single-level configJeff King2017-02-242-3/+10
| * | | | | | | | | | | | | parse_config_key: use skip_prefix instead of starts_withJeff King2017-02-241-4/+3
| * | | | | | | | | | | | | refs: parse_hide_refs_config to use parse_config_keysb/parse-hide-refs-config-cleanupStefan Beller2017-02-241-3/+4
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Git 2.12.2v2.12.2Junio C Hamano2017-03-243-2/+25
* | | | | | | | | | | | | Merge branch 'ab/doc-no-option-notation-fix' into maintJunio C Hamano2017-03-242-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | doc: change erroneous --[no]-whatever into --[no-]whateverab/doc-no-option-notation-fixÆvar Arnfjörð Bjarmason2017-03-202-2/+2
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'ab/push-default-doc-fix' into maintJunio C Hamano2017-03-241-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | push: mention "push.default=tracking" in the documentationab/push-default-doc-fixÆvar Arnfjörð Bjarmason2017-03-201-0/+2
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'nd/commit-hook-doc-fix' into maintJunio C Hamano2017-03-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | git-commit.txt: list post-rewrite in HOOKS sectionnd/commit-hook-doc-fixNguyễn Thái Ngọc Duy2017-03-201-1/+1
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'jc/config-case-cmdline-take-2' into maintJunio C Hamano2017-03-242-97/+163
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | config: use git_config_parse_key() in git_config_parse_parameter()jc/config-case-cmdline-take-2Junio C Hamano2017-02-232-5/+71