summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | mv: allow renaming to fix case on case insensitive filesystemsdt/merge-recursive-case-insensitiveDavid Turner2014-05-081-1/+1
| * | | | | | | | | | | | | | | | | | | merge-recursive.c: fix case-changing merge bugDavid Turner2014-05-071-0/+53
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'rs/reflog-exists'Junio C Hamano2014-06-061-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | checkout.c: use ref_exists instead of file_existrs/reflog-existsRonnie Sahlberg2014-05-081-0/+8
| | |_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/utf8-switch-between-nfd-and-nfc'Junio C Hamano2014-06-061-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | t3910: show failure of core.precomposeunicode with decomposed filenamesjk/utf8-switch-between-nfd-and-nfcJeff King2014-04-291-0/+10
| | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/commit-C-pick-empty'Junio C Hamano2014-06-061-1/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | commit: do not complain of empty messages from -Cjk/commit-C-pick-emptyJeff King2014-04-281-1/+10
| | |_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'ew/config-protect-mode'Junio C Hamano2014-06-031-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | config: preserve config file permissions on editsew/config-protect-modeEric Wong2014-05-061-0/+10
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'jk/commit-date-approxidate'Junio C Hamano2014-06-033-2/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | commit: accept more date formats for "--date"Jeff King2014-05-021-2/+10
| * | | | | | | | | | | | | | | | | | commit: print "Date" line when the user has set dateJeff King2014-05-023-0/+18
| | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'ep/shell-command-substitution'Junio C Hamano2014-06-0332-151/+151
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | t5000-tar-tree.sh: use the $( ... ) construct for command substitutionep/shell-command-substitutionElia Pinto2014-04-301-3/+3
| * | | | | | | | | | | | | | | | | | t4204-patch-id.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-301-2/+2
| * | | | | | | | | | | | | | | | | | t4119-apply-config.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-301-1/+1
| * | | | | | | | | | | | | | | | | | t4116-apply-reverse.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-301-6/+6
| * | | | | | | | | | | | | | | | | | t4057-diff-combined-paths.sh: use the $( ... ) construct for command substitu...Elia Pinto2014-04-301-1/+1
| * | | | | | | | | | | | | | | | | | t4038-diff-combined.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-301-1/+1