summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rr/submodule-diff-config'Junio C Hamano2012-11-251-1/+43
|\
| * diff: rename "set" variableJeff King2012-11-181-0/+15
| * diff: introduce diff.submodule configuration variableRamkumar Ramachandra2012-11-181-1/+28
* | Merge branch 'jh/update-ref-d-through-symref'Junio C Hamano2012-11-251-0/+18
|\ \
| * | Fix failure to delete a packed ref through a symrefJohan Herland2012-10-211-1/+1
| * | t1400-update-ref: Add test verifying bug with symrefs in delete_ref()Johan Herland2012-10-211-0/+18
* | | Merge branch 'lt/diff-stat-show-0-lines'Junio C Hamano2012-11-253-26/+27
|\ \ \
| * | | Fix "git diff --stat" for interesting - but empty - file changesLinus Torvalds2012-10-173-26/+27
* | | | Merge branch 'jk/config-ignore-duplicates'Junio C Hamano2012-11-212-131/+188
|\ \ \ \
| * | | | git-config: do not complain about duplicate entriesJeff King2012-10-242-4/+5
| * | | | t1300: test "git config --get-all" more thoroughlyJeff King2012-10-241-2/+7
| * | | | t1300: remove redundant testJeff King2012-10-241-4/+0
| * | | | t1300: style updatesJeff King2012-10-241-123/+178
| |/ / /
* | | | Merge branch 'cn/config-missing-path'Junio C Hamano2012-11-201-0/+5
|\ \ \ \
| * | | | config: don't segfault when given --path with a missing valueCarlos Martín Nieto2012-11-151-0/+5
* | | | | Merge branch 'mg/replace-resolve-delete'Junio C Hamano2012-11-201-0/+11
|\ \ \ \ \
| * | | | | replace: parse revision argument for -dMichael J Gruber2012-11-131-0/+11
* | | | | | Merge branch 'jk/maint-gitweb-xss'Junio C Hamano2012-11-201-0/+15
|\ \ \ \ \ \
| * | | | | | gitweb: escape html in rss titleJeff King2012-11-121-0/+15
* | | | | | | Merge branch 'pw/maint-p4-rcs-expansion-newline'Junio C Hamano2012-11-201-0/+19
|\ \ \ \ \ \ \
| * | | | | | | git p4: RCS expansion should not span newlinesPete Wyckoff2012-11-081-0/+19
| |/ / / / / /
* | | | | | | Merge branch 'jk/maint-http-half-auth-fetch'Junio C Hamano2012-11-202-0/+22
|\ \ \ \ \ \ \
| * | | | | | | remote-curl: retry failed requests for auth even with gzipJeff King2012-10-312-0/+22
* | | | | | | | Merge branch 'jc/prettier-pretty-note'Junio C Hamano2012-11-151-2/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | format-patch --notes: show notes after three-dashesJunio C Hamano2012-10-171-2/+5
| * | | | | | | | format-patch: append --signature after notesJunio C Hamano2012-10-171-2/+10
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'cr/cvsimport-local-zone'Junio C Hamano2012-11-154-0/+338
|\ \ \ \ \ \ \ \
| * | | | | | | | git-cvsimport: allow author-specific timezonesChris Rorvick2012-10-164-0/+338
| |/ / / / / / /
* | | | | | | | Merge branch 'ph/submodule-sync-recursive'Junio C Hamano2012-11-151-2/+53
|\ \ \ \ \ \ \ \
| * | | | | | | | Add tests for submodule sync --recursivePhil Hord2012-10-291-2/+53
| |/ / / / / / /
* | | | | | | | Merge branch 'jk/maint-diff-grep-textconv'Junio C Hamano2012-11-151-0/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | diff_grep: use textconv buffers for add/deleted filesJeff King2012-10-281-0/+12
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jh/symbolic-ref-d'Junio C Hamano2012-11-151-0/+30
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | git symbolic-ref --delete $symrefJohan Herland2012-10-211-0/+30
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'ph/maint-submodule-status-fix'Jeff King2012-11-091-2/+2
|\ \ \ \ \ \ \
| * | | | | | | t7407: Fix recursive submodule testPhil Hord2012-10-291-2/+2
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'fc/completion-send-email-with-format-patch'Jeff King2012-11-091-0/+5
|\ \ \ \ \ \ \
| * | | | | | | completion: add format-patch options to send-emailFelipe Contreras2012-10-161-0/+5
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'mo/cvs-server-cleanup'Jeff King2012-11-092-1/+106
|\ \ \ \ \ \ \
| * | | | | | | Use character class for sed expression instead of \sBen Walton2012-10-261-1/+1
| * | | | | | | cvsserver status: provide real sticky infoMatthew Ogilvie2012-10-161-0/+35
| * | | | | | | cvsserver: use whole CVS rev number in-process; don't strip "1." prefixMatthew Ogilvie2012-10-161-1/+1
| * | | | | | | cvsserver t9400: add basic 'cvs log' testMatthew Ogilvie2012-10-161-0/+70
| |/ / / / / /
* | | | | | | Merge branch 'km/send-email-compose-encoding'Jeff King2012-11-091-0/+86
|\ \ \ \ \ \ \
| * | | | | | | git-send-email: skip RFC2047 quoting for ASCII subjectsKrzysztof Mazur2012-10-251-0/+17
| * | | | | | | git-send-email: use compose-encoding for SubjectKrzysztof Mazur2012-10-251-0/+14
| * | | | | | | git-send-email: introduce compose-encodingKrzysztof Mazur2012-10-101-0/+55
* | | | | | | | Merge branch 'js/format-2047'Jeff King2012-11-092-87/+148
|\ \ \ \ \ \ \ \
| * | | | | | | | format-patch tests: check quoting/encoding in To: and Cc: headersJan H. Schönherr2012-10-181-32/+66
| * | | | | | | | format-patch: fix rfc2047 address encoding with respect to rfc822 specialsJan H. Schönherr2012-10-181-1/+1