summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jl/status-added-submodule-is-never-ignored'Junio C Hamano2014-06-161-2/+72
|\
| * commit -m: commit staged submodules regardless of ignore configjl/status-added-submodule-is-never-ignoredJens Lehmann2014-04-071-1/+1
| * status/commit: show staged submodules regardless of ignore configJens Lehmann2014-04-071-2/+72
* | Merge branch 'as/pretty-truncate'Junio C Hamano2014-06-164-71/+276
|\ \
| * | pretty.c: format string with truncate respects logOutputEncodingas/pretty-truncateAlexey Shumkin2014-05-212-7/+7
| * | t4205, t6006: add tests that fail with i18n.logOutputEncoding setAlexey Shumkin2014-05-212-2/+213
| * | t4205 (log-pretty-format): use `tformat` rather than `format`Alexey Shumkin2014-05-211-39/+13
| * | t4041, t4205, t6006, t7102: don't hardcode tested encoding valueAlexey Shumkin2014-05-214-27/+39
| * | t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputsAlexey Shumkin2014-05-191-3/+11
* | | Merge branch 'rr/rebase-autostash-fix'Junio C Hamano2014-06-161-0/+15
|\ \ \
| * | | rebase -i: test "Nothing to do" case with autostashrr/rebase-autostash-fixMatthieu Moy2014-05-201-0/+15
* | | | Merge branch 'jk/diff-files-assume-unchanged'Junio C Hamano2014-06-161-0/+11
|\ \ \ \
| * | | | run_diff_files: do not look at uninitialized stat datajk/diff-files-assume-unchangedJeff King2014-05-151-0/+11
* | | | | Merge branch 'jk/do-not-run-httpd-tests-as-root'Junio C Hamano2014-06-161-0/+5
|\ \ \ \ \
| * | | | | t/lib-httpd: require SANITY prereqjk/do-not-run-httpd-tests-as-rootJeff King2014-05-121-0/+5
| * | | | | Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' into maintJunio C Hamano2014-05-081-22/+22
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'km/avoid-bs-in-shell-glob' into maintJunio C Hamano2014-05-081-2/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'km/avoid-cp-a' into maintJunio C Hamano2014-05-081-2/+2
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge branch 'cc/replace-edit'Junio C Hamano2014-06-161-0/+27
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | replace: add tests for --editChristian Couder2014-05-191-0/+27
* | | | | | | | | | Merge branch 'mt/patch-id-stable' (early part)Junio C Hamano2014-06-163-11/+117
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | patch-id-test: test stable and unstable behaviourMichael S. Tsirkin2014-06-101-11/+91
| * | | | | | | | | | test doc: test_write_lines does not split its argumentsJonathan Nieder2014-06-101-4/+3
| * | | | | | | | | | test: add test_write_lines helperMichael S. Tsirkin2014-06-102-0/+27
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jc/shortlog-ref-exclude'Junio C Hamano2014-06-091-0/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | shortlog: allow --exclude=<glob> to be passedjc/shortlog-ref-excludeJunio C Hamano2014-06-041-0/+6
* | | | | | | | | | | Merge branch 'pb/trim-trailing-spaces'Junio C Hamano2014-06-091-0/+23
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | dir.c:trim_trailing_spaces(): fix for " \ " sequencePasha Bolokhov2014-06-021-0/+23
* | | | | | | | | | | | Merge branch 'na/no-http-test-in-the-middle'Junio C Hamano2014-06-092-59/+100
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t5538: move http push tests out to t5542na/no-http-test-in-the-middleNick Alcock2014-05-302-59/+100
* | | | | | | | | | | | | Merge branch 'jc/rev-parse-argh-dashed-multi-words'Junio C Hamano2014-06-091-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | update-index: fix segfault with missing --cacheinfo argumentjc/rev-parse-argh-dashed-multi-wordsJeff King2014-06-041-0/+4
* | | | | | | | | | | | | | Merge branch 'lt/request-pull'Junio C Hamano2014-06-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | fix brown paper bag breakage in t5150-request-pull.shlt/request-pullJohannes Sixt2014-06-021-1/+1
* | | | | | | | | | | | | | | Merge branch 'mc/git-p4-prepare-p4-only'Junio C Hamano2014-06-061-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | git-p4: Do not include diff in spec file when just preparing p4mc/git-p4-pre-are-p4-onlyMaxime Coste2014-05-271-1/+2
* | | | | | | | | | | | | | | | Merge branch 'jn/test-lint-unmoor'Junio C Hamano2014-06-061-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | test-lint: find unportable sed, echo, test, and export usage after &&jn/test-lint-unmoorJonathan Nieder2014-05-231-4/+4
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'ep/shell-assign-and-export-vars'Junio C Hamano2014-06-062-2/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | scripts: more "export VAR=VALUE" fixesep/shell-assign-and-export-varsJunio C Hamano2014-05-232-2/+10
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'nd/status-auto-comment-char'Junio C Hamano2014-06-062-2/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | commit: allow core.commentChar=auto for character auto selectionnd/status-auto-comment-charNguyễn Thái Ngọc Duy2014-05-191-0/+26
| * | | | | | | | | | | | | | | | config: be strict on core.commentCharNguyễn Thái Ngọc Duy2014-05-191-2/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'mt/rebase-i-keep-empty-test'Junio C Hamano2014-06-061-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | rebase --keep-empty -i: add testmt/rebase-i-keep-empty-testMichael S. Tsirkin2014-05-191-0/+8
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'mk/show-s-no-extra-blank-line-for-merges'Junio C Hamano2014-06-063-10/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | git-show: fix 'git show -s' to not add extra terminator after merge commitmk/show-s-no-extra-blank-line-for-mergesMax Kirillov2014-05-153-10/+13
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'bc/blame-crlf-test'Junio C Hamano2014-06-061-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | blame: correctly handle files regardless of autocrlfbc/blame-crlf-testbrian m. carlson2014-05-081-0/+9
| | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'dt/merge-recursive-case-insensitive'Junio C Hamano2014-06-061-0/+53
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \