summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* format_commit_message: honor `color=auto` for `%C(auto)`et/pretty-format-c-autoEdward Thomson2016-05-271-7/+19
* Merge branch 'sb/clean-test-fix' into HEADJunio C Hamano2016-05-181-1/+1
|\
| * t7300: mark test with SANITYsb/clean-test-fixStefan Beller2016-05-031-1/+1
* | Merge branch 'sg/test-lib-simplify-expr-away' into HEADJunio C Hamano2016-05-181-5/+5
|\ \
| * | test-lib: simplify '--option=value' parsingsg/test-lib-simplify-expr-awaySZEDER Gábor2016-04-221-5/+5
* | | Merge branch 'js/close-packs-before-gc' into HEADJunio C Hamano2016-05-181-0/+1
|\ \ \
| * | | t5510: run auto-gc in the foregroundjs/close-packs-before-gcSZEDER Gábor2016-05-021-0/+1
* | | | Merge branch 'ls/p4-lfs' into HEADJunio C Hamano2016-05-181-0/+4
|\ \ \ \
| * | | | git-p4: fix Git LFS pointer parsingLars Schneider2016-04-281-0/+4
* | | | | Merge branch 'ls/p4-lfs-test-fix-2.7.0' into HEADJunio C Hamano2016-05-181-1/+1
|\ \ \ \ \
| * | | | | t9824: fix wrong reference valuels/p4-lfs-test-fix-2.7.0Lars Schneider2016-04-291-1/+1
| * | | | | t9824: fix broken &&-chain in a subshellSZEDER Gábor2016-04-241-1/+1
* | | | | | Merge branch 'nf/mergetool-prompt' into HEADJunio C Hamano2016-05-181-1/+1
|\ \ \ \ \ \
| * | | | | | difftool/mergetool: make the form of yes/no questions consistentnf/mergetool-promptNikola Forró2016-04-251-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'jk/push-client-deadlock-fix' into HEADJunio C Hamano2016-05-181-6/+4
|\ \ \ \ \ \
| * | | | | | t5504: drop sigpipe=ok from push testsJeff King2016-04-201-6/+4
* | | | | | | Merge branch 'sb/mv-submodule-fix' into HEADJunio C Hamano2016-05-181-0/+16
|\ \ \ \ \ \ \
| * | | | | | | mv: allow moving nested submodulessb/mv-submodule-fixStefan Beller2016-04-191-0/+16
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'ld/p4-test-py3' into HEADJunio C Hamano2016-05-182-6/+7
|\ \ \ \ \ \ \
| * | | | | | | git-p4 tests: time_in_seconds should use $PYTHON_PATHld/p4-test-py3Luke Diamand2016-04-261-1/+1
| * | | | | | | git-p4 tests: work with python3 as well as python2Luke Diamand2016-04-262-5/+6
| * | | | | | | git-p4 tests: cd to / before running pythonLuke Diamand2016-04-261-1/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'sb/submodule-path-misc-bugs' into maintJunio C Hamano2016-05-062-5/+126
|\ \ \ \ \ \ \
| * | | | | | | t7407: make expectation as clear as possiblesb/submodule-path-misc-bugsStefan Beller2016-03-301-2/+6
| * | | | | | | submodule update: test recursive path reporting from subdirectoryStefan Beller2016-03-301-0/+20
| * | | | | | | submodule update: align reporting path for custom command executionStefan Beller2016-03-301-3/+26
| * | | | | | | submodule status: correct path handling in recursive submodulesStefan Beller2016-03-301-0/+21
| * | | | | | | submodule update --init: correct path handling in recursive submodulesStefan Beller2016-03-301-0/+33
| * | | | | | | submodule foreach: correct path display in recursive submodulesStefan Beller2016-03-301-0/+20
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'jk/use-write-script-more' into maintJunio C Hamano2016-05-023-18/+20
|\ \ \ \ \ \ \
| * | | | | | | t3404: use write_scriptjk/use-write-script-moreJunio C Hamano2016-04-121-4/+3
| * | | | | | | t1020: do not overuse printf and use write_scriptJunio C Hamano2016-04-111-5/+5
| * | | | | | | t5532: use write_scriptJeff King2016-04-101-9/+12
| |/ / / / / /
* | | | | | | Merge branch 'ad/commit-have-m-option' into maintJunio C Hamano2016-05-021-0/+20
|\ \ \ \ \ \ \
| * | | | | | | commit: do not ignore an empty message given by -m ''ad/commit-have-m-optionJeff King2016-04-071-3/+3
| * | | | | | | commit: --amend -m '' silently fails to wipe messageAdam Dinwoodie2016-04-071-0/+20
* | | | | | | | Merge branch 'sb/submodule-helper-clone-regression-fix' into maintJunio C Hamano2016-05-021-0/+41
|\ \ \ \ \ \ \ \
| * | | | | | | | submodule--helper, module_clone: always operate on absolute pathsStefan Beller2016-04-011-1/+1
| * | | | | | | | recursive submodules: test for relative pathsStefan Beller2016-03-311-0/+41
| * | | | | | | | Merge 'hv/submodule-config' to 'sb/submodule-helper'Junio C Hamano2015-08-191-0/+153
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge branch 'jk/branch-shortening-funny-symrefs' into maintJunio C Hamano2016-05-021-0/+12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | branch: fix shortening of non-remote symrefsjk/branch-shortening-funny-symrefsJeff King2016-04-041-0/+12
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'ky/branch-m-worktree' into maintJunio C Hamano2016-05-021-1/+22
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | branch -m: update all per-worktree HEADsKazuki Yamaguchi2016-04-041-1/+22
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'ky/branch-d-worktree' into maintJunio C Hamano2016-05-021-0/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | branch -d: refuse deleting a branch which is currently checked outky/branch-d-worktreeKazuki Yamaguchi2016-03-291-0/+6
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf' into maintJunio C Hamano2016-04-291-0/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | correct blame for files commited with CRLFtb/blame-force-read-cache-to-workaround-safe-crlfTorsten Bögershausen2016-04-051-0/+14
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'sk/send-pack-all-fix' into maintJunio C Hamano2016-04-291-0/+12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-send-pack: fix --all option when used with directorysk/send-pack-all-fixStanislav Kolotinskiy2016-03-311-0/+12
View Lorry Controller Status