summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | | t4036-format-patch-signer-mime.sh: use the $( ... ) construct for command sub...Elia Pinto2014-04-301-1/+1
| * | | | | | t4014-format-patch.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-301-5/+5
| * | | | | | t4013-diff-various.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-301-3/+3
| * | | | | | t4012-diff-binary.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-301-8/+8
| * | | | | | t4010-diff-pathspec.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-301-2/+2
| * | | | | | t4006-diff-mode.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-301-1/+1
| * | | | | | t3910-mac-os-precompose.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-301-8/+8
| * | | | | | t3905-stash-include-untracked.sh: use the $( ... ) construct for command subs...Elia Pinto2014-04-301-2/+2
| * | | | | | t1050-large.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-291-2/+2
| * | | | | | t1020-subdirectory.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-291-11/+11
| * | | | | | t1004-read-tree-m-u-wf.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-291-4/+4
| * | | | | | t1003-read-tree-prefix.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-291-1/+1
| * | | | | | t1002-read-tree-m-u-2way.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-291-5/+5
| * | | | | | t1001-read-tree-m-2way.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-291-9/+9