summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rd/send-email-2047-fix'Junio C Hamano2015-01-071-0/+7
|\
| * send-email: handle adjacent RFC 2047-encoded words properlyrd/send-email-2047-fixРоман Донченко2014-12-151-0/+7
* | Merge branch 'jk/approxidate-avoid-y-d-m-over-future-dates'Junio C Hamano2015-01-071-0/+3
|\ \
| * | approxidate: allow ISO-like dates far in the futurejk/approxidate-avoid-y-d-m-over-future-datesJeff King2014-11-131-0/+3
* | | Merge branch 'nd/lockfile-absolute'Junio C Hamano2015-01-071-0/+15
|\ \ \
| * | | lockfile.c: store absolute pathnd/lockfile-absoluteNguyễn Thái Ngọc Duy2014-11-031-0/+15
* | | | Merge branch 'jc/strbuf-add-lines-avoid-sp-ht-sequence'Junio C Hamano2015-01-071-0/+6
|\ \ \ \
| * | | | strbuf_add_commented_lines(): avoid SP-HT sequence in commented linesjc/strbuf-add-lines-avoid-sp-ht-sequenceJunio C Hamano2014-10-271-0/+6
* | | | | Merge branch 'jc/diff-b-m'Junio C Hamano2015-01-072-3/+4
|\ \ \ \ \
| * | | | | diff -B -M: fix output for "copy and then rewrite" caseJunio C Hamano2014-10-232-3/+4
* | | | | | Merge branch 'jc/clone-borrow'Junio C Hamano2015-01-071-0/+17
|\ \ \ \ \ \
| * | | | | | clone: --dissociate option to mark that reference is only temporaryjc/clone-borrowJunio C Hamano2014-10-151-0/+17
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'jc/checkout-local-track-report'Junio C Hamano2015-01-071-0/+18
|\ \ \ \ \ \
| * | | | | | checkout: report upstream correctly even with loosely defined branch.*.mergejc/checkout-local-track-reportJunio C Hamano2014-10-141-0/+18
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'for-junio' of git://bogomips.org/git-svnJunio C Hamano2014-12-291-0/+95
|\ \ \ \ \ \
| * | | | | | git-svn: support for git-svn propsetAlfred Perlstein2014-12-091-0/+95
* | | | | | | Merge branch 'jc/t9001-modernise'Junio C Hamano2014-12-291-294/+287
|\ \ \ \ \ \ \
| * | | | | | | t9001: style modernisation phase #5jc/t9001-moderniseJunio C Hamano2014-11-251-76/+74
| * | | | | | | t9001: style modernisation phase #4Junio C Hamano2014-11-251-10/+10
| * | | | | | | t9001: style modernisation phase #3Junio C Hamano2014-11-251-52/+47
| * | | | | | | t9001: style modernisation phase #2Junio C Hamano2014-11-251-151/+151
| * | | | | | | t9001: style modernisation phase #1Junio C Hamano2014-11-251-17/+17
* | | | | | | | Merge branch 'mh/update-ref-verify'Junio C Hamano2014-12-291-0/+92
|\ \ \ \ \ \ \ \
| * | | | | | | | update-ref: fix "verify" command with missing <oldvalue>mh/update-ref-verifyMichael Haggerty2014-12-111-2/+2
| * | | | | | | | t1400: add some more tests of "update-ref --stdin"'s verify commandMichael Haggerty2014-12-111-0/+92
* | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \