summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* code and test: fix misuses of "nor"jl/nor-or-nand-andJustin Lebar2014-03-317-7/+7
* Merge branch 'jk/clean-d-pathspec' into maintJunio C Hamano2014-03-181-0/+16
|\
| * clean: respect pathspecs with "-d"Jeff King2014-03-111-0/+16
* | Merge branch 'da/difftool-git-files' into maintJunio C Hamano2014-03-181-0/+14
|\ \
| * | t7800: add a difftool test for .git-filesda/difftool-git-filesJunio C Hamano2014-03-051-0/+14
| |/
* | Merge branch 'jk/remote-pushremote-config-reading' into maintJunio C Hamano2014-03-181-0/+13
|\ \
| * | remote: handle pushremote config in any orderjk/remote-pushremote-config-readingJeff King2014-02-241-0/+13
| |/
* | Merge branch 'jk/commit-dates-parsing-fix' into maintJunio C Hamano2014-03-182-0/+59
|\ \
| * | log: do not segfault on gmtime errorsJeff King2014-02-241-0/+8
| * | log: handle integer overflow in timestampsJeff King2014-02-241-0/+16
| * | fsck: report integer overflow in author timestampsJeff King2014-02-241-0/+14
| * | t4212: test bogus timestamps with git-logJeff King2014-02-241-0/+21
* | | Merge branch 'tr/diff-submodule-no-reuse-worktree' into maintJunio C Hamano2014-03-181-1/+29
|\ \ \
| * | | diff: do not reuse_worktree_file for submodulestr/diff-submodule-no-reuse-worktreeThomas Rast2014-02-181-1/+29
* | | | Merge branch 'nd/reset-setup-worktree' into maintJunio C Hamano2014-03-181-0/+11
|\ \ \ \
| * | | | reset: optionally setup worktree and refresh index on --mixednd/reset-setup-worktreeNguyễn Thái Ngọc Duy2014-02-181-0/+11
| | |_|/ | |/| |
| * | | Merge branch 'bm/merge-base-octopus-dedup' into maintJunio C Hamano2014-02-131-0/+39
| |\ \ \
| * \ \ \ Merge branch 'jc/revision-range-unpeel' into maintJunio C Hamano2014-02-131-0/+17
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/allow-fetch-onelevel-refname' into maintJunio C Hamano2014-02-131-0/+11
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/interpret-branch-name-fix' into maintJunio C Hamano2014-02-132-1/+51
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'as/tree-walk-fix-aggressive-short-cut' into maintJunio C Hamano2014-02-131-0/+13
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'ow/stash-with-ifs' into maintJunio C Hamano2014-02-051-0/+12
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'js/lift-parent-count-limit' into maintJunio C Hamano2014-02-052-1/+36
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'nd/add-empty-fix' into maintJunio C Hamano2014-02-051-0/+19
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'bc/log-decoration' into maintJunio C Hamano2014-02-051-0/+15
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jl/commit-v-strip-marker' into maintJunio C Hamano2014-02-051-1/+27
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tb/clone-ssh-with-colon-for-port' into maintJunio C Hamano2014-02-052-21/+198
| |\ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/check-attr-honor-working-tree' into maintJunio C Hamano2014-03-181-22/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | check-attr: move to the top of working tree when in non-bare repositoryjc/check-attr-honor-working-treeJunio C Hamano2014-02-061-0/+10
| * | | | | | | | | | | | | | | t0003: do not chdir the whole test processJunio C Hamano2014-02-061-22/+30
* | | | | | | | | | | | | | | | Merge branch 'bk/refresh-missing-ok-in-merge-recursive' into maintJunio C Hamano2014-03-181-0/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | merge-recursive.c: tolerate missing files while refreshing indexbk/refresh-missing-ok-in-merge-recursiveBrad King2014-02-241-1/+1
| * | | | | | | | | | | | | | | | t3030-merge-recursive: test known breakage with empty work treeBrad King2014-02-241-0/+47
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'nd/diff-quiet-stat-dirty' into maintJunio C Hamano2014-03-181-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | diff: do not quit early on stat-dirty filesnd/diff-quiet-stat-dirtyNguyễn Thái Ngọc Duy2014-02-241-0/+6
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'nd/http-fetch-shallow-fix' into maintJunio C Hamano2014-03-189-35/+83
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | t5537: move http tests out to t5539nd/http-fetch-shallow-fixNguyễn Thái Ngọc Duy2014-02-132-57/+82
| * | | | | | | | | | | | | | | | fetch-pack: fix deepen shallow over smart http with no-done capNguyễn Thái Ngọc Duy2014-02-101-0/+30
| * | | | | | | | | | | | | | | | test: rename http fetch and push test filesNguyễn Thái Ngọc Duy2014-02-104-0/+0
| * | | | | | | | | | | | | | | | tests: auto-set LIB_HTTPD_PORT from test nameJeff King2014-02-108-8/+1
* | | | | | | | | | | | | | | | | Merge branch 'nd/submodule-pathspec-ending-with-slash' into maintJunio C Hamano2014-03-182-3/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | pathspec: pass directory indicator to match_pathspec_item()Nguyễn Thái Ngọc Duy2014-02-241-0/+6
| * | | | | | | | | | | | | | | | | pathspec: rename match_pathspec_depth() to match_pathspec()Nguyễn Thái Ngọc Duy2014-02-241-3/+3
* | | | | | | | | | | | | | | | | | Merge branch 'aj/ada-diff-word-pattern'Junio C Hamano2014-02-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | userdiff: update Ada patternsaj/ada-diff-word-patternAdrian Johnson2014-02-051-1/+1
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'jn/pager-lv-default-env'Junio C Hamano2014-01-311-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | pager test: make fake pager consume all its inputjn/pager-lv-default-envJonathan Nieder2014-01-311-1/+1
* | | | | | | | | | | | | | | | | | Merge branch 'as/tree-walk-fix-aggressive-short-cut'Junio C Hamano2014-01-271-0/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | tree_entry_interesting: match against all pathspecsas/tree-walk-fix-aggressive-short-cutAndy Spencer2014-01-271-0/+13
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'jk/test-fixes'Junio C Hamano2014-01-272-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |