summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* 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
* | trailer: add tests for commands in config fileChristian Couder2014-10-131-0/+125
* | trailer: add tests for "git interpret-trailers"Christian Couder2014-10-131-0/+738
* | 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
| | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'maint-1.8.5' into maint-1.9Junio C Hamano2014-07-161-2/+2
| |\ \ \ \ \ \ | | |/ / / / /
* | | | | | | Merge branch 'jk/command-line-config-empty-string'Junio C Hamano2014-09-091-0/+11
|\ \ \ \ \ \ \
| * | | | | | | config: teach "git -c" to recognize an empty stringjk/command-line-config-empty-stringJunio C Hamano2014-08-051-0/+11
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'jc/not-mingw-cygwin'Junio C Hamano2014-09-0915-60/+56
|\ \ \ \ \ \ \
| * | | | | | | test prerequisites: enumerate with commasjc/not-mingw-cygwinJunio C Hamano2014-07-212-9/+9
| * | | | | | | test prerequisites: eradicate NOT_FOOJunio C Hamano2014-07-2115-60/+56
* | | | | | | | Merge branch 'bc/archive-pax-header-mode'Junio C Hamano2014-09-021-0/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | archive: honor tar.umask even for pax headersbc/archive-pax-header-modebrian m. carlson2014-08-041-0/+5
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'ta/config-set'Junio C Hamano2014-09-021-0/+200
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | test-config: add tests for the config_set APITanay Abhra2014-07-291-0/+200
* | | | | | | | Merge branch 'jk/diff-tree-t-fix'Junio C Hamano2014-08-261-0/+34
|\ \ \ \ \ \ \ \
| * | | | | | | | intersect_paths: respect mode in git's tree-sortjk/diff-tree-t-fixJeff King2014-08-201-0/+34
* | | | | | | | | Merge branch 'jk/pack-shallow-always-without-bitmap'Junio C Hamano2014-08-261-0/+39
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | pack-objects: turn off bitmaps when we see --shallow linesjk/pack-shallow-always-without-bitmapJeff King2014-08-121-0/+39
* | | | | | | | | tests: fix negated test_i18ngrep callsJohannes Sixt2014-08-133-6/+6
* | | | | | | | | Sync with 2.0.4Junio C Hamano2014-07-301-0/+1
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | commit --amend: test specifies authorship but forgets to checkFabian Ruch2014-07-301-0/+1
View Lorry Controller Status