summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* shortlog: disallow left-over arguments outside repoma/shortlog-revparseMartin Ågren2018-03-151-0/+5
* Merge branch 'sb/submodule-update-reset-fix' into maintJunio C Hamano2018-02-271-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' into maintJunio C Hamano2018-02-271-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 'nd/ita-wt-renames-in-status' into maintJunio C Hamano2018-02-271-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 'nd/add-i-ignore-submodules' into maintJunio C Hamano2018-02-151-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 'tg/stash-with-pathspec-fix' into maintJunio C Hamano2018-02-151-0/+32
|\ \ \ \ \
| * | | | | stash: don't delete untracked files that match pathspectg/stash-with-pathspec-fixThomas Gummerer2018-01-081-0/+32
* | | | | | Merge branch 'jk/abort-clone-with-existing-dest' into maintJunio C Hamano2018-02-151-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' into maintJunio C Hamano2018-02-151-0/+32
|\ \ \ \ \ \
| * | | | | | merge: teach -Xours/-Xtheirs to symbolic link mergejc/merge-symlink-ours-theirsJunio C Hamano2018-01-031-0/+32
* | | | | | | Merge branch 'dk/describe-all-output-fix' into maintJunio C Hamano2018-02-151-1/+5
|\ \ \ \ \ \ \
| * | | | | | | describe: prepend "tags/" when describing tags with embedded namedk/describe-all-output-fixDaniel Knittl-Frank2017-12-271-1/+5
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'ab/perf-grep-threads' into maintJunio C Hamano2018-02-152-21/+86
|\ \ \ \ \ \ \
| * | | | | | | perf: amend the grep tests to test grep.threadsab/perf-grep-threadsÆvar Arnfjörð Bjarmason2018-01-042-21/+86
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | 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
* | | | | | | | | | | | Merge branch 'js/test-with-ws-in-path'Junio C Hamano2018-01-095-10/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | / / / / / / | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | t0302 & t3900: add forgotten quotesJohannes Schindelin2018-01-032-5/+5
| * | | | | | | | | | Allow the test suite to pass in a directory whose name contains spacesJohannes Schindelin2018-01-033-5/+5
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jh/memihash-opt'Junio C Hamano2018-01-051-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t/helper/test-lazy-name-hash: fix compilationjh/memihash-optStefan Beller2017-12-221-1/+1
* | | | | | | | | | | Merge branch 'tb/test-lint-wc-l'Junio C Hamano2018-01-051-0/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | check-non-portable-shell.pl: `wc -l` may have leading WStb/test-lint-wc-lTorsten Bögershausen2017-12-221-0/+1
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'ld/p4-multiple-shelves'Junio C Hamano2018-01-051-10/+14
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git-p4: update multiple shelved change listsld/p4-multiple-shelvesLuke Diamand2017-12-221-10/+14
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'ew/empty-merge-with-dirty-index'Junio C Hamano2018-01-051-5/+21
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with...Junio C Hamano2017-12-221-5/+21
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | / / / / | | | |_|_|_|/ / / / | | |/| | | | | | |
| | * | | | | | | | merge-recursive: avoid incorporating uncommitted changes in a mergeElijah Newren2017-12-221-1/+1
| | * | | | | | | | t6044: recursive can silently incorporate dirty changes in a mergeElijah Newren2017-12-221-5/+21
| | | |_|_|/ / / / | | |/| | | | | |
View Lorry Controller Status