summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'es/checkout-index-temp'Junio C Hamano2015-01-121-195/+205
|\
| * checkout-index: fix --temp relative path manglinges/checkout-index-tempEric Sunshine2014-12-291-1/+1
| * t2004: demonstrate broken relative path printingEric Sunshine2014-12-291-0/+12
| * t2004: standardize file naming in symlink testEric Sunshine2014-12-291-3/+3
| * t2004: drop unnecessary write-tree/read-treeEric Sunshine2014-12-291-3/+0
| * t2004: modernize styleEric Sunshine2014-12-291-195/+196
* | Merge branch 'cc/bisect-rev-parsing'Junio C Hamano2015-01-121-0/+9
|\ \
| * | bisect: add test to check that revs are properly parsedcc/bisect-rev-parsingChristian Couder2014-12-291-0/+9
* | | Merge branch 'maint'Junio C Hamano2015-01-071-0/+15
|\ \ \
| * \ \ Merge branch 'maint-2.1' into maintJunio C Hamano2015-01-071-0/+15
| |\ \ \ | | |/ / | |/| |
| | * | Merge branch 'maint-2.0' into maint-2.1maint-2.1Junio C Hamano2015-01-071-0/+15
| | |\ \
| | | * \ Merge branch 'maint-1.9' into maint-2.0maint-2.0Junio C Hamano2015-01-071-0/+15
| | | |\ \ | | | | |/ | | | |/|
| | | | * Merge branch 'maint-1.8.5' into maint-1.9maint-1.9Junio C Hamano2015-01-071-0/+15
| | | | |\
| | | | | * Merge branch 'jk/dotgit-case-maint-1.8.5' into maint-1.8.5maint-1.8.5Junio C Hamano2015-01-071-0/+15
| | | | | |\
| | | | | | * is_hfs_dotgit: loosen over-eager match of \u{..47}jk/dotgit-case-maint-1.8.5dotgit-case-maint-1.8.5Jeff King2014-12-291-0/+15
* | | | | | | Merge branch 'bw/maint-0090-awk-tweak'Junio C Hamano2015-01-071-1/+1
|\ \ \ \ \ \ \
| * | | | | | | t0090: tweak awk statement for Solaris /usr/xpg4/bin/awkbw/maint-0090-awk-tweakBen Walton2014-12-231-1/+1
| |/ / / / / /
| * | | | | | Merge branch 'jk/no-perl-tests' into maintJunio C Hamano2014-12-223-4/+4
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/push-simple' into maintJunio C Hamano2014-12-221-2/+30
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'mh/config-flip-xbit-back-after-checking' into maintJunio C Hamano2014-12-221-0/+7
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/colors-fix' into maintJunio C Hamano2014-12-221-0/+8
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/checkout-from-tree' into maintJunio C Hamano2014-12-221-0/+17
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/t5400-remove-unused'Junio C Hamano2015-01-071-15/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t5400: remove dead codesb/t5400-remove-unusedStefan Beller2014-12-161-15/+1
* | | | | | | | | | | | | Merge branch 'lh/send-email-hide-x-mailer'Junio C Hamano2015-01-071-0/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | test/send-email: --[no-]xmailer testslh/send-email-hide-x-mailerLuis Henriques2014-12-151-0/+33
* | | | | | | | | | | | | | 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