summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Add a regression test for 'git remote add <existing> <same-url>'js/remote-add-with-insteadofJohannes Schindelin2014-12-231-0/+5
* Merge branch 'ch/new-gpg-drops-rfc-1991'Junio C Hamano2014-12-228-15/+126
|\
| * tests: make comment on GPG keyring match the codeChristian Hesse2014-12-161-3/+13
| * tests: squelch noise from GPG machinery set-upJunio C Hamano2014-12-121-12/+14
| * tests: replace binary GPG keyrings with ASCII-armored keysChristian Hesse2014-12-124-2/+89
| * tests: skip RFC1991 tests for gnupg 2.1Christian Hesse2014-12-122-7/+11
| * tests: create gpg homedir on the flyChristian Hesse2014-12-124-3/+11
* | Merge branch 'jk/test-asan'Junio C Hamano2014-12-222-0/+4
|\ \
| * | t: support clang/gcc AddressSanitizerjk/test-asanJeff King2014-12-112-0/+4
* | | Merge branch 'jk/always-allow-large-packets'Junio C Hamano2014-12-221-0/+33
|\ \ \
| * | | pkt-line: allow writing of LARGE_PACKET_MAX buffersjk/always-allow-large-packetsJeff King2014-12-101-0/+33
| |/ /
* | | Merge branch 'jk/colors'Junio C Hamano2014-12-221-0/+15
|\ \ \
| * | | parse_color: recognize "no$foo" to clear the $foo attributeJeff King2014-11-201-0/+11
| * | | parse_color: support 24-bit RGB valuesJeff King2014-11-201-0/+4
* | | | Merge branch 'js/fsck-tag-validation'Junio C Hamano2014-12-221-2/+6
|\ \ \ \
| * | | | fsck: properly bound "invalid tag name" error messageJeff King2014-12-091-2/+6
* | | | | Merge branch 'mg/branch-d-m-f'Junio C Hamano2014-12-221-0/+14
|\ \ \ \ \
| * | | | | branch: allow -f with -m and -dmg/branch-d-m-fMichael J Gruber2014-12-091-0/+5
| * | | | | t3200-branch: test -MMichael J Gruber2014-12-041-0/+9
* | | | | | Merge branch 'tb/t0027-eol-conversion'Junio C Hamano2014-12-221-16/+66
|\ \ \ \ \ \
| * | | | | | t0027: check the eol conversion warningstb/t0027-eol-conversionTorsten Bögershausen2014-12-051-16/+66
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'jk/for-each-reflog-ent-reverse'Junio C Hamano2014-12-221-0/+30
|\ \ \ \ \ \
| * | | | | | for_each_reflog_ent_reverse: fix newlines on block boundariesJeff King2014-12-051-0/+30
* | | | | | | Merge branch 'jk/credential-quit'Junio C Hamano2014-12-221-0/+9
|\ \ \ \ \ \ \
| * | | | | | | credential: let helpers tell us to quitJeff King2014-12-041-0/+9
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'nd/ls-tree-pathspec'Junio C Hamano2014-12-221-4/+18
|\ \ \ \ \ \ \
| * | | | | | | t3102: style modernizationnd/ls-tree-pathspecJunio C Hamano2014-12-011-8/+8
| * | | | | | | t3102: document that ls-tree does not yet support negated pathspecJunio C Hamano2014-12-011-0/+6
| * | | | | | | ls-tree: remove path filtering logic in show_treeNguyễn Thái Ngọc Duy2014-12-011-0/+8
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'rj/t0050-passes'Junio C Hamano2014-12-221-1/+1
|\ \ \ \ \ \ \
| * | | | | | | t0050-*.sh: mark the rename (case change) test as passingrj/t0050-passesRamsay Jones2014-11-301-1/+1
* | | | | | | | Merge branch 'js/push-to-deploy'Junio C Hamano2014-12-221-0/+104
|\ \ \ \ \ \ \ \
| * | | | | | | | t5516: more tests for receive.denyCurrentBranch=updateInsteadjs/push-to-updatejs/push-to-deployJunio C Hamano2014-11-301-9/+87
| * | | | | | | | receive-pack: add another option for receive.denyCurrentBranchJohannes Schindelin2014-11-301-0/+26
* | | | | | | | | Merge branch 'pb/send-email-te'Junio C Hamano2014-12-221-0/+157
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-send-email: add --transfer-encoding optionpb/send-email-tePaolo Bonzini2014-11-251-0/+157
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'pb/am-message-id-footer'Junio C Hamano2014-12-225-0/+70
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-am: add --message-id/--no-message-idpb/am-message-id-footerPaolo Bonzini2014-11-251-0/+23
| * | | | | | | | | git-mailinfo: add --message-idPaolo Bonzini2014-11-254-0/+47
| |/ / / / / / / /
* | | | | | | | | Merge branch 'js/t5000-dont-copy-bin-sh'Junio C Hamano2014-12-221-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t5000 on Windows: do not mistake "sh.exe" as "sh"js/t5000-dont-copy-bin-shJohannes Sixt2014-11-241-1/+1
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jc/refer-to-t-readme-from-submitting-patches'Junio C Hamano2014-12-221-1/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t/README: justify why "! grep foo" is sufficientjc/refer-to-t-readme-from-submitting-patchesJunio C Hamano2014-11-241-1/+2
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'mg/add-ignore-errors'Junio C Hamano2014-12-221-1/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | add: ignore only ignored filesmg/add-ignore-errorsMichael J Gruber2014-11-211-1/+7
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'cc/interpret-trailers-more'Junio C Hamano2014-12-222-9/+67
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | trailer: add test with an old style conflict blockcc/interpret-trailers-moreChristian Couder2014-11-101-1/+31
| * | | | | | | | | trailer: reuse ignore_non_trailer() to ignore conflict linesChristian Couder2014-11-101-0/+2
| * | | | | | | | | Merge branch 'jc/conflict-hint' into cc/interpret-trailers-moreJunio C Hamano2014-11-101-8/+34
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | merge & sequencer: turn "Conflicts:" hint into a commentjc/conflict-hintJunio C Hamano2014-10-281-8/+34
| | | |/ / / / / / / | | |/| | | | | | |