summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | Merge branch 'ks/submodule-doc-updates' into maintJunio C Hamano2018-03-222-29/+87
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Doc/git-submodule: improve readability and grammar of a sentenceks/submodule-doc-updatesKaartic Sivaraam2018-01-161-8/+8
| * | | | | | | | | | | | Doc/gitsubmodules: make some changes to improve readability and syntaxKaartic Sivaraam2018-01-161-21/+79
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'cl/t9001-cleanup' into maintJunio C Hamano2018-03-221-10/+7
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t9001: use existing helper in send-email testcl/t9001-cleanupChristian Ludwig2018-01-121-10/+7
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'bw/oidmap-autoinit' into maintJunio C Hamano2018-03-221-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | oidmap: ensure map is initializedbw/oidmap-autoinitBrandon Williams2017-12-271-0/+11
* | | | | | | | | | | | | Merge branch 'sg/test-i18ngrep' into maintJunio C Hamano2018-03-228-43/+72
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t: make 'test_i18ngrep' more informative on failuresg/test-i18ngrepSZEDER Gábor2018-02-081-4/+20
| * | | | | | | | | | | | | t: validate 'test_i18ngrep's parametersSZEDER Gábor2018-02-081-0/+12
| * | | | | | | | | | | | | t: move 'test_i18ncmp' and 'test_i18ngrep' to 'test-lib-functions.sh'SZEDER Gábor2018-02-082-26/+26
| * | | | | | | | | | | | | t5536: let 'test_i18ngrep' read the file without redirectionSZEDER Gábor2018-02-081-1/+1
| * | | | | | | | | | | | | t5510: consolidate 'grep' and 'test_i18ngrep' patternsSZEDER Gábor2018-02-081-6/+3
| * | | | | | | | | | | | | t4001: don't run 'git status' upstream of a pipeSZEDER Gábor2018-02-081-3/+8
| * | | | | | | | | | | | | t6022: don't run 'git merge' upstream of a pipeSZEDER Gábor2018-02-081-2/+4
| * | | | | | | | | | | | | t5812: add 'test_i18ngrep's missing filename parameterSZEDER Gábor2018-02-081-4/+1
| * | | | | | | | | | | | | t5541: add 'test_i18ngrep's missing filename parameterSZEDER Gábor2018-02-081-1/+1
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jt/fsck-code-cleanup' into maintJunio C Hamano2018-03-221-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | fsck: fix leak when traversing treesjt/fsck-code-cleanupEric Wong2018-01-231-1/+7
* | | | | | | | | | | | | | Merge branch 'ew/svn-branch-segfault-fix' into maintJunio C Hamano2018-03-221-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | git-svn: control destruction order to avoid segfaultew/svn-branch-segfault-fixEric Wong2018-01-301-0/+5
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'nd/list-merge-strategy' into maintJunio C Hamano2018-03-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | completion: fix completing merge strategies on non-C localesnd/list-merge-strategyDuy Nguyen2018-01-261-1/+1
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'jk/daemon-fixes' into maintJunio C Hamano2018-03-224-20/+107
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | daemon: fix length computation in newline strippingjk/daemon-fixesJeff King2018-01-252-4/+17
| * | | | | | | | | | | | | | t/lib-git-daemon: add network-protocol helpersJeff King2018-01-252-1/+58
| * | | | | | | | | | | | | | daemon: handle NULs in extended attribute stringJeff King2018-01-252-8/+9
| * | | | | | | | | | | | | | daemon: fix off-by-one in logging extended attributesJeff King2018-01-252-2/+13
| * | | | | | | | | | | | | | t/lib-git-daemon: record daemon logJeff King2018-01-251-4/+12
| * | | | | | | | | | | | | | t5570: use ls-remote instead of clone for interp testsJeff King2018-01-251-6/+3
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'tg/split-index-fixes' into maintJunio C Hamano2018-03-228-17/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | travis: run tests with GIT_TEST_SPLIT_INDEXtg/split-index-fixesThomas Gummerer2018-01-191-0/+4
| * | | | | | | | | | | | | | split-index: don't write cache tree with null oid entriesThomas Gummerer2018-01-194-2/+24
| * | | | | | | | | | | | | | read-cache: fix reading the shared index for other reposThomas Gummerer2018-01-195-15/+20
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'mr/packed-ref-store-fix' into maintJunio C Hamano2018-03-221-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | files_initial_transaction_commit(): only unlock if lockedmr/packed-ref-store-fixMathias Rav2018-01-191-2/+1
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'jt/http-redact-cookies' into maintJunio C Hamano2018-03-223-8/+117
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | http: support omitting data from tracesjt/http-redact-cookiesJonathan Tan2018-01-193-8/+35
| * | | | | | | | | | | | | | http: support cookie redaction when tracingJonathan Tan2018-01-193-0/+82
* | | | | | | | | | | | | | | Merge branch 'nd/diff-flush-before-warning' into maintJunio C Hamano2018-03-221-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | diff.c: flush stdout before printing rename warningsnd/diff-flush-before-warningNguyễn Thái Ngọc Duy2018-01-161-0/+1
| | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'sg/travis-build-during-script-phase' into maintJunio C Hamano2018-03-223-15/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | travis-ci: build Git during the 'script' phasesg/travis-build-during-script-phaseSZEDER Gábor2018-01-083-15/+4
* | | | | | | | | | | | | | | | Merge branch 'ys/bisect-object-id-missing-conversion-fix' into maintJunio C Hamano2018-02-271-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | bisect: debug: convert struct object to object_idYasushi SHOJI2018-01-091-3/+3
| | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'sb/submodule-update-reset-fix' into maintJunio C Hamano2018-02-273-3/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | submodule: submodule_move_head omits old argument in forced casesb/submodule-update-reset-fixStefan Beller2018-01-052-1/+17
| * | | | | | | | | | | | | | | | unpack-trees: oneway_merge to update submodulesStefan Beller2018-01-051-0/+3
| * | | | | | | | | | | | | | | | t/lib-submodule-update.sh: fix test ignoring ignored files in submodulesStefan Beller2018-01-051-0/+1
| * | | | | | | | | | | | | | | | t/lib-submodule-update.sh: clarify testStefan Beller2018-01-051-2/+2