summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | t5531: further "matching" fixupsjk/t5531-prepare-to-default-to-non-matchingJeff King2014-01-131-0/+1
* | | | | | | | | | | | Merge branch 'sb/diff-orderfile-config'Junio C Hamano2014-01-131-4/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | diff test: reading a directory as a file need not error outsb/diff-orderfile-configJonathan Nieder2014-01-101-4/+0
* | | | | | | | | | | | | Merge branch 'jl/submodule-mv-checkout-caveat'Junio C Hamano2014-01-132-0/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | rm: better document side effects when removing a submodulejl/submodule-mv-checkout-caveatJens Lehmann2014-01-071-0/+16
| * | | | | | | | | | | | | mv: better document side effects when moving a submoduleJens Lehmann2014-01-071-0/+21
* | | | | | | | | | | | | | Merge branch 'jk/pull-rebase-using-fork-point'Junio C Hamano2014-01-131-2/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | rebase: fix fork-point with zero argumentsJohn Keeping2014-01-091-2/+10
* | | | | | | | | | | | | | | Merge branch 'ow/stash-with-ifs'Junio C Hamano2014-01-131-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | stash: handle specifying stashes with $IFSow/stash-with-ifsØystein Walle2014-01-071-0/+12
| | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jn/pager-lv-default-env'Junio C Hamano2014-01-131-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | pager: set LV=-c alongside LESS=FRSXJonathan Nieder2014-01-071-0/+12
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'js/lift-parent-count-limit'Junio C Hamano2014-01-102-1/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Remove the line length limit for graft filesjs/lift-parent-count-limitJohannes Schindelin2013-12-272-1/+36
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'jk/test-framework-updates'Junio C Hamano2014-01-102-14/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | t0000: drop "known breakage" testjk/test-framework-updatesJeff King2014-01-021-3/+0
| * | | | | | | | | | | | | | t0000: simplify HARNESS_ACTIVE hackJeff King2014-01-022-11/+5
| * | | | | | | | | | | | | | t0000: set TEST_OUTPUT_DIRECTORY for sub-testsJeff King2014-01-021-0/+2
| |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge branch 'jk/two-way-merge-corner-case-fix' into maintJunio C Hamano2013-12-172-89/+104
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/sha1-loose-object-info-check-existence' into maintJunio C Hamano2013-12-171-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/magic-pathspec' into maintJunio C Hamano2013-12-171-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bm/merge-base-octopus-dedup'Junio C Hamano2014-01-101-0/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | merge-base --octopus: reduce the result from get_octopus_merge_bases()bm/merge-base-octopus-dedupJunio C Hamano2013-12-301-0/+39
| | |_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'jk/http-auth-tests-robustify'Junio C Hamano2014-01-106-17/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | use distinct username/password for http auth testsjk/http-auth-tests-robustifyJeff King2014-01-026-17/+26
| | |_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'jk/oi-delta-base'Junio C Hamano2014-01-101-0/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | cat-file: provide %(deltabase) batch formatjk/oi-delta-baseJeff King2013-12-261-0/+34
* | | | | | | | | | | | | | | | | | Merge branch 'nd/add-empty-fix'Junio C Hamano2014-01-101-0/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | add: don't complain when adding empty project rootnd/add-empty-fixNguyễn Thái Ngọc Duy2013-12-261-0/+19
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'tm/fetch-prune'Junio C Hamano2014-01-101-0/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | fetch --prune: Run prune before fetchingtm/fetch-pruneTom Miller2014-01-031-0/+14
| * | | | | | | | | | | | | | | | | | fetch --prune: always print header urlTom Miller2014-01-031-0/+12
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'sb/diff-orderfile-config'Junio C Hamano2014-01-101-0/+104
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | diff: add diff.orderfile configuration variableSamuel Bronson2013-12-181-0/+10
| * | | | | | | | | | | | | | | | | diff: let "git diff -O" read orderfile from any file and fail properlySamuel Bronson2013-12-181-0/+26
| * | | | | | | | | | | | | | | | | t4056: add new tests for "git diff -O"Samuel Bronson2013-12-181-0/+68
* | | | | | | | | | | | | | | | | | Merge branch 'bc/log-decoration'Junio C Hamano2014-01-101-0/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | log: properly handle decorations with chained tagsbc/log-decorationbrian m. carlson2013-12-201-0/+15
| | |_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'cc/replace-object-info'Junio C Hamano2014-01-101-0/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | replace info: rename 'full' to 'long' and clarify in-code symbolscc/replace-object-infoChristian Couder2013-12-301-2/+2
| * | | | | | | | | | | | | | | | | | builtin/replace: unset read_replace_refsChristian Couder2013-12-121-1/+1
| * | | | | | | | | | | | | | | | | | t6050: add tests for listing with --formatChristian Couder2013-12-121-0/+37
| * | | | | | | | | | | | | | | | | | sha1_file: perform object replacement in sha1_object_info_extended()Christian Couder2013-12-121-1/+1
| * | | | | | | | | | | | | | | | | | t6050: show that git cat-file --batch fails with replace objectsChristian Couder2013-12-121-0/+5
| | |_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'nd/negative-pathspec'Junio C Hamano2014-01-101-0/+184
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Support pathspec magic :(exclude) and its short form :!Nguyễn Thái Ngọc Duy2013-12-061-0/+184
* | | | | | | | | | | | | | | | | Merge branch 'jk/name-pack-after-byte-representation'Junio C Hamano2013-12-271-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | pack-objects: name pack files after trailer hashJeff King2013-12-051-2/+2
* | | | | | | | | | | | | | | | | | Merge branch 'tg/diff-no-index-refactor'Junio C Hamano2013-12-272-0/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | diff: add test for --no-index executed outside repoThomas Gummerer2013-12-161-0/+11