summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'js/no-test-cmp-for-binaries'Junio C Hamano2014-09-191-1/+1
|\
| * t9300: use test_cmp_bin instead of test_cmp to compare binary filesjs/no-test-cmp-for-binariesJohannes Sixt2014-09-121-1/+1
* | Merge branch 'ta/config-add-to-empty-or-true-fix'Junio C Hamano2014-09-191-0/+20
|\ \
| * | make config --add behave correctly for empty and NULL valuesTanay Abhra2014-08-181-0/+20
* | | Merge branch 'jc/parseopt-verify-short-name'Junio C Hamano2014-09-191-2/+2
|\ \ \
| * | | parse-options: detect attempt to add a duplicate short option namejc/parseopt-verify-short-nameJunio C Hamano2014-09-041-2/+2
| |/ /
* | | Merge branch 'mk/reachable-protect-detached-head'Junio C Hamano2014-09-191-0/+22
|\ \ \
| * | | reachable.c: add HEAD to reachability starting commitsmk/reachable-protect-detached-headMax Kirillov2014-09-031-0/+22
| | |/ | |/|
* | | Merge branch 'tb/crlf-tests'Junio C Hamano2014-09-194-120/+175
|\ \ \
| * | | MinGW: update tests to handle a native eol of crlftb/crlf-testsBrice Lambson2014-09-022-20/+35
| * | | Makefile: propagate NATIVE_CRLF to CPat Thoyts2014-09-021-0/+20
| * | | t0027: Tests for core.eol=native, eol=lf, eol=crlfTorsten Bögershausen2014-08-281-100/+120
* | | | Merge branch 'mb/fast-import-delete-root'Junio C Hamano2014-09-191-0/+104
|\ \ \ \
| * | | | fast-import: fix segfault in store_tree()mb/fast-import-delete-rootMaxim Bublis2014-08-291-2/+2
| * | | | t9300: test filedelete commandMaxim Bublis2014-08-291-0/+104
| | |/ / | |/| |
* | | | Merge branch 'bb/date-iso-strict'Junio C Hamano2014-09-191-0/+8
|\ \ \ \
| * | | | pretty: provide a strict ISO 8601 date formatbb/date-iso-strictBeat Bolli2014-08-291-0/+8
* | | | | Merge branch 'jk/fast-export-anonymize'Junio C Hamano2014-09-191-0/+112
|\ \ \ \ \
| * | | | | teach fast-export an --anonymize optionJeff King2014-08-271-0/+112
| |/ / / /
* | | | | Merge branch 'jk/send-pack-many-refspecs'Junio C Hamano2014-09-192-0/+107
|\ \ \ \ \
| * | | | | send-pack: take refspecs over stdinjk/send-pack-many-refspecsJeff King2014-08-262-0/+107
| | |/ / / | |/| | |
* | | | | git svn: info: correctly handle absolute path argsEric Wong2014-09-141-0/+30
* | | | | Merge branch 'jn/unpack-trees-checkout-m-carry-deletion'Junio C Hamano2014-09-111-0/+17
|\ \ \ \ \
| * | | | | checkout -m: attempt merge when deletion of path was stagedjn/unpack-trees-checkout-m-carry-deletionJonathan Nieder2014-08-251-0/+17
* | | | | | Merge branch 'jk/prune-top-level-refs-after-packing'Junio C Hamano2014-09-111-0/+7
|\ \ \ \ \ \
| * | | | | | pack-refs: prune top-level refs like "refs/foo"jk/prune-top-level-refs-after-packingJeff King2014-08-251-0/+7
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'nd/large-blobs'Junio C Hamano2014-09-111-0/+20
|\ \ \ \ \ \
| * | | | | | diff: shortcut for diff'ing two binary SHA-1 objectsnd/large-blobsNguyễn Thái Ngọc Duy2014-08-181-0/+10
| * | | | | | diff --stat: mark any file larger than core.bigfilethreshold binaryNguyễn Thái Ngọc Duy2014-08-181-0/+4
| * | | | | | sha1_file.c: do not die failing to malloc in unpack_compressed_entryNguyễn Thái Ngọc Duy2014-08-181-0/+6
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'dt/cache-tree-repair'Junio C Hamano2014-09-111-17/+145
|\ \ \ \ \ \
| * | | | | | cache-tree: do not try to use an invalidated subtree info to build a treeJunio C Hamano2014-09-031-0/+8
| * | | | | | cache-tree: Write updated cache-tree after commitDavid Turner2014-07-141-15/+102
| * | | | | | cache-tree: subdirectory testsDavid Turner2014-07-111-3/+23
| * | | | | | cache-tree: create/update cache-tree on checkoutDavid Turner2014-07-071-3/+16
* | | | | | | Merge branch 'ta/config-set-1'Junio C Hamano2014-09-112-1/+22
|\ \ \ \ \ \ \
| * | | | | | | add tests for `git_config_get_string_const()`ta/config-set-1Tanay Abhra2014-08-071-0/+10
| * | | | | | | add a test for semantic errors in config filesTanay Abhra2014-08-071-0/+11
| * | | | | | | rewrite git_config() to use the config-set APITanay Abhra2014-08-071-1/+1
* | | | | | | | Merge branch 'nd/strbuf-utf8-replace'Junio C Hamano2014-09-091-0/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | utf8.c: fix strbuf_utf8_replace() consuming data beyond input stringnd/strbuf-utf8-replaceNguyễn Thái Ngọc Duy2014-08-111-0/+7
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'rs/refresh-beyond-symlink'Junio C Hamano2014-09-091-0/+43
|\ \ \ \ \ \ \ \
| * | | | | | | | read-cache: check for leading symlinks when refreshing indexrs/refresh-beyond-symlinkRené Scharfe2014-08-101-0/+43
* | | | | | | | | Merge branch 'jk/stash-list-p'Junio C Hamano2014-09-091-0/+42
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | stash: default listing to working-tree diffjk/stash-list-pJeff King2014-08-071-0/+42
| |/ / / / / / / /
* | | | | | | | | Merge branch 'lf/bundle-exclusion'Junio C Hamano2014-09-091-1/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | bundle: fix exclusion of annotated tagslf/bundle-exclusionLukas Fleischer2014-08-071-1/+4
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jc/apply-ws-prefix'Junio C Hamano2014-09-092-0/+28
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | apply: omit ws check for excluded pathsjc/apply-ws-prefixJunio C Hamano2014-08-071-0/+11
| * | | | | | | | | apply: use the right attribute for paths in non-Git patchesJunio C Hamano2014-08-071-0/+17
| | |/ / / / / / / | |/| | | | | | |