summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/fsck-exit-code-fix' into maintJunio C Hamano2014-09-292-7/+83
|\
| * fsck: return non-zero status on missing ref tipsjk/fsck-exit-code-fixJeff King2014-09-121-0/+56
| * fsck: exit with non-zero status upon error from fsck_obj()Jeff King2014-09-102-7/+27
* | Merge branch 'ta/config-add-to-empty-or-true-fix' into maintJunio C Hamano2014-09-291-0/+20
|\ \
| * | make config --add behave correctly for empty and NULL valuesTanay Abhra2014-08-181-0/+20
* | | Merge branch 'mk/reachable-protect-detached-head' into maintJunio C Hamano2014-09-291-0/+22
|\ \ \
| * | | reachable.c: add HEAD to reachability starting commitsmk/reachable-protect-detached-headMax Kirillov2014-09-031-0/+22
* | | | Merge branch 'mb/fast-import-delete-root' into maintJunio C Hamano2014-09-291-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 'jk/send-pack-many-refspecs' into maintJunio C Hamano2014-09-292-0/+107
|\ \ \ \
| * | | | send-pack: take refspecs over stdinjk/send-pack-many-refspecsJeff King2014-08-262-0/+107
| |/ / /
* | | | Merge branch 'jk/prune-top-level-refs-after-packing' into maintJunio C Hamano2014-09-191-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 'jn/unpack-trees-checkout-m-carry-deletion' into maintJunio C Hamano2014-09-191-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 'rs/refresh-beyond-symlink' into maintJunio C Hamano2014-09-191-0/+43
|\ \ \ \ \
| * | | | | read-cache: check for leading symlinks when refreshing indexrs/refresh-beyond-symlinkRené Scharfe2014-08-101-0/+43
| | |_|_|/ | |/| | |
* | | | | Merge branch 'lf/bundle-exclusion' into maintJunio C Hamano2014-09-191-1/+4
|\ \ \ \ \
| * | | | | bundle: fix exclusion of annotated tagslf/bundle-exclusionLukas Fleischer2014-08-071-1/+4
| | |/ / / | |/| | |
* | | | | Merge branch 'jc/apply-ws-prefix' into maintJunio C Hamano2014-09-192-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' into maintJunio C Hamano2014-09-191-0/+11
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | config: teach "git -c" to recognize an empty stringjk/command-line-config-empty-stringJunio C Hamano2014-08-051-0/+11
| | |/ / | |/| |
* | | | 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
* | | | | | Merge branch 'sk/mingw-tests-workaround'Junio C Hamano2014-07-308-24/+51
|\ \ \ \ \ \
| * | | | | | t800[12]: work around MSys limitationsk/mingw-tests-workaroundKarsten Blees2014-07-211-0/+12
| * | | | | | t9902: mingw-specific fix for gitfile link filesPat Thoyts2014-07-211-4/+13
| * | | | | | t4210: skip command-line encoding tests on mingwPat Thoyts2014-07-211-2/+2
| * | | | | | MinGW: disable legacy encoding testsKarsten Blees2014-07-213-15/+18
| * | | | | | t0110/MinGW: skip tests that pass arbitrary bytes on the command lineKarsten Blees2014-07-211-2/+5
| * | | | | | MinGW: Skip test redirecting to fd 4Johannes Schindelin2014-07-171-1/+1
* | | | | | | Merge branch 'sk/mingw-uni-fix-more'Junio C Hamano2014-07-304-7/+13
|\ \ \ \ \ \ \
| * | | | | | | tests: do not pass iso8859-1 encoded parameterPat Thoyts2014-07-154-7/+13
* | | | | | | | Merge branch 'ep/avoid-test-a-o'Junio C Hamano2014-07-301-2/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | t9814: fix misconversion from test $a -o $b to test $a || test $bep/avoid-test-a-oJunio C Hamano2014-07-251-2/+8
* | | | | | | | | Merge branch 'maint'Junio C Hamano2014-07-281-0/+10
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | t4013: test diff-tree's --stdin commit formattingJeff King2014-07-281-0/+10
| * | | | | | | | Merge branch 'zk/log-graph-showsig' into maintJunio C Hamano2014-07-221-0/+31
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'cb/filter-branch-prune-empty-degenerate-merges' into maintJunio C Hamano2014-07-221-0/+11
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jm/dedup-test-config' into maintJunio C Hamano2014-07-221-5/+0
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'sk/test-cmp-bin' into maintJunio C Hamano2014-07-225-22/+28
| |\ \ \ \ \ \ \ \ \ \ \