summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* dir: convert struct sha1_stat to use object_idPatryk Obara2018-01-301-2/+2
* Merge branch 'nd/add-i-ignore-submodules'Junio C Hamano2018-01-231-0/+48
|\
| * add--interactive: ignore submodule changes except HEADnd/add-i-ignore-submodulesNguyễn Thái Ngọc Duy2018-01-161-0/+48
* | Merge branch 'mm/send-email-fallback-to-local-mail-address'Junio C Hamano2018-01-233-94/+19
|\ \
| * | send-email: add test for Linux's get_maintainer.plmm/send-email-fallback-to-local-mail-addressAlex Bennée2018-01-081-0/+19
| * | perl/Git: remove now useless email-address parsing codeMatthieu Moy2018-01-082-94/+0
* | | Merge branch 'tg/stash-with-pathspec-fix'Junio C Hamano2018-01-231-0/+32
|\ \ \
| * | | stash: don't delete untracked files that match pathspectg/stash-with-pathspec-fixThomas Gummerer2018-01-081-0/+32
* | | | Merge branch 'sb/submodule-update-reset-fix'Junio C Hamano2018-01-231-2/+17
|\ \ \ \
| * | | | submodule: submodule_move_head omits old argument in forced casesb/submodule-update-reset-fixStefan Beller2018-01-051-0/+14
| * | | | 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
| | |/ / | |/| |
* | | | Merge branch 'ab/commit-m-with-fixup'Junio C Hamano2018-01-231-1/+8
|\ \ \ \
| * | | | commit: add support for --fixup <commit> -m"<extra message>"ab/commit-m-with-fixupÆvar Arnfjörð Bjarmason2017-12-221-1/+8
* | | | | Merge branch 'cc/codespeed'Junio C Hamano2018-01-232-54/+137
|\ \ \ \ \
| * | | | | perf/run: read GIT_PERF_REPO_NAME from perf.repoNamecc/codespeedChristian Couder2018-01-051-0/+3
| * | | | | perf/run: learn to send output to codespeed serverChristian Couder2018-01-051-1/+11
| * | | | | perf/run: learn about perf.codespeedOutputChristian Couder2018-01-051-1/+6
| * | | | | perf/run: add conf_opts argument to get_var_from_env_or_config()Christian Couder2018-01-051-5/+6
| * | | | | perf/aggregate: implement codespeed JSON outputChristian Couder2018-01-051-2/+62
| * | | | | perf/aggregate: refactor printing resultsChristian Couder2018-01-051-46/+50
| * | | | | perf/aggregate: fix checking ENV{GIT_PERF_SUBSECTION}Christian Couder2018-01-051-1/+1
* | | | | | Merge branch 'ab/perf-grep-threads'Junio C Hamano2018-01-232-21/+86
|\ \ \ \ \ \
| * | | | | | perf: amend the grep tests to test grep.threadsab/perf-grep-threadsÆvar Arnfjörð Bjarmason2018-01-042-21/+86
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'sb/diff-blobfind-pickaxe'Junio C Hamano2018-01-231-0/+68
|\ \ \ \ \ \
| * | | | | | diffcore: add a pickaxe option to find a specific blobStefan Beller2018-01-041-0/+68
* | | | | | | Merge branch 'jk/abort-clone-with-existing-dest'Junio C Hamano2018-01-231-26/+74
|\ \ \ \ \ \ \
| * | | | | | | clone: do not clean up directories we didn't createjk/abort-clone-with-existing-destJeff King2018-01-031-5/+51
| * | | | | | | t5600: modernize styleJeff King2018-01-031-23/+25
| * | | | | | | t5600: fix outdated comment about unborn HEADJeff King2018-01-031-1/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'jc/merge-symlink-ours-theirs'Junio C Hamano2018-01-231-0/+32
|\ \ \ \ \ \ \
| * | | | | | | merge: teach -Xours/-Xtheirs to symbolic link mergejc/merge-symlink-ours-theirsJunio C Hamano2018-01-031-0/+32
* | | | | | | | Merge branch 'nd/ita-wt-renames-in-status'Junio C Hamano2018-01-231-0/+72
|\ \ \ \ \ \ \ \
| * | | | | | | | wt-status.c: handle worktree renamesnd/ita-wt-renames-in-statusNguyễn Thái Ngọc Duy2017-12-271-0/+60
| * | | | | | | | t2203: test status output with porcelain v2 formatNguyễn Thái Ngọc Duy2017-12-271-0/+12
* | | | | | | | | Merge branch 'dk/describe-all-output-fix'Junio C Hamano2018-01-231-1/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | describe: prepend "tags/" when describing tags with embedded namedk/describe-all-output-fixDaniel Knittl-Frank2017-12-271-1/+5
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'bc/hash-algo' into maintJunio C Hamano2018-01-211-0/+17
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t5601-clone: test case-conflicting files on case-insensitive filesystemEric Sunshine2018-01-211-0/+17
* | | | | | | | | | Merge branch 'js/test-with-ws-in-path'Junio C Hamano2018-01-111-4/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t3900: add some more quotesjs/test-with-ws-in-pathBeat Bolli2018-01-101-4/+4
* | | | | | | | | | | Merge branch 'js/perl-path-workaround-in-tests'Junio C Hamano2018-01-101-1/+16
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | mingw: handle GITPERLLIB in t0021 in a Windows-compatible wayjs/perl-path-workaround-in-testsJohannes Schindelin2018-01-101-1/+16
* | | | | | | | | | | | Merge branch 'ew/empty-merge-with-dirty-index'Junio C Hamano2018-01-101-0/+50
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with...ew/empty-merge-with-dirty-indexJunio C Hamano2018-01-091-0/+50
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | merge-recursive: do not look at the index during recursive mergeew/empty-merge-with-dirty-index-maintJunio C Hamano2018-01-091-0/+50
* | | | | | | | | | | | | | Merge branch 'js/fix-merge-arg-quoting-in-rebase-p'Junio C Hamano2018-01-101-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | rebase -p: fix quoting when calling `git merge`Johannes Schindelin2018-01-051-0/+14
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'bw/protocol-v1'Junio C Hamano2018-01-091-6/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | http: fix v1 protocol tests with apache httpd < 2.4bw/protocol-v1Todd Zullinger2018-01-041-6/+4
View Lorry Controller Status