aboutsummaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAge
* Merge branch 'jk/t5531-prepare-to-default-to-non-matching'Junio C Hamano2014-01-13
|\
| * t5531: further "matching" fixupsJeff King2014-01-13
* | Merge branch 'sb/diff-orderfile-config'Junio C Hamano2014-01-13
|\ \
| * | diff test: reading a directory as a file need not error outJonathan Nieder2014-01-10
* | | Merge branch 'jl/submodule-mv-checkout-caveat'Junio C Hamano2014-01-13
|\ \ \
| * | | rm: better document side effects when removing a submoduleJens Lehmann2014-01-07
| * | | mv: better document side effects when moving a submoduleJens Lehmann2014-01-07
* | | | Merge branch 'jk/pull-rebase-using-fork-point'Junio C Hamano2014-01-13
|\ \ \ \
| * | | | rebase: fix fork-point with zero argumentsJohn Keeping2014-01-09
* | | | | Merge branch 'ow/stash-with-ifs'Junio C Hamano2014-01-13
|\ \ \ \ \
| * | | | | stash: handle specifying stashes with $IFSØystein Walle2014-01-07
* | | | | | Merge branch 'jn/pager-lv-default-env'Junio C Hamano2014-01-13
|\ \ \ \ \ \
| * | | | | | pager: set LV=-c alongside LESS=FRSXJonathan Nieder2014-01-07
| |/ / / / /
* | | | | | Merge branch 'js/lift-parent-count-limit'Junio C Hamano2014-01-10
|\ \ \ \ \ \
| * | | | | | Remove the line length limit for graft filesJohannes Schindelin2013-12-27
| |/ / / / /
* | | | | | Merge branch 'jk/test-framework-updates'Junio C Hamano2014-01-10
|\ \ \ \ \ \
| * | | | | | t0000: drop "known breakage" testJeff King2014-01-02
| * | | | | | t0000: simplify HARNESS_ACTIVE hackJeff King2014-01-02
| * | | | | | t0000: set TEST_OUTPUT_DIRECTORY for sub-testsJeff King2014-01-02
| |/ / / / /
| * | | | | Merge branch 'jk/two-way-merge-corner-case-fix' into maintJunio C Hamano2013-12-17
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'sb/sha1-loose-object-info-check-existence' into maintJunio C Hamano2013-12-17
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'nd/magic-pathspec' into maintJunio C Hamano2013-12-17
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge branch 'bm/merge-base-octopus-dedup'Junio C Hamano2014-01-10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | merge-base --octopus: reduce the result from get_octopus_merge_bases()Junio C Hamano2013-12-30
* | | | | | | | | | Merge branch 'jk/http-auth-tests-robustify'Junio C Hamano2014-01-10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | use distinct username/password for http auth testsJeff King2014-01-02
* | | | | | | | | | | Merge branch 'jk/oi-delta-base'Junio C Hamano2014-01-10
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | cat-file: provide %(deltabase) batch formatJeff King2013-12-26
* | | | | | | | | | | | Merge branch 'nd/add-empty-fix'Junio C Hamano2014-01-10
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | add: don't complain when adding empty project rootNguyễn Thái Ngọc Duy2013-12-26
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'tm/fetch-prune'Junio C Hamano2014-01-10
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | fetch --prune: Run prune before fetchingTom Miller2014-01-03
| * | | | | | | | | | | | fetch --prune: always print header urlTom Miller2014-01-03
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'sb/diff-orderfile-config'Junio C Hamano2014-01-10
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
| * | | | | | | | | | | diff: add diff.orderfile configuration variableSamuel Bronson2013-12-18
| * | | | | | | | | | | diff: let "git diff -O" read orderfile from any file and fail properlySamuel Bronson2013-12-18
| * | | | | | | | | | | t4056: add new tests for "git diff -O"Samuel Bronson2013-12-18
* | | | | | | | | | | | Merge branch 'bc/log-decoration'Junio C Hamano2014-01-10
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | log: properly handle decorations with chained tagsbrian m. carlson2013-12-20
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'cc/replace-object-info'Junio C Hamano2014-01-10
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | replace info: rename 'full' to 'long' and clarify in-code symbolsChristian Couder2013-12-30
| * | | | | | | | | | | | builtin/replace: unset read_replace_refsChristian Couder2013-12-12
| * | | | | | | | | | | | t6050: add tests for listing with --formatChristian Couder2013-12-12
| * | | | | | | | | | | | sha1_file: perform object replacement in sha1_object_info_extended()Christian Couder2013-12-12
| * | | | | | | | | | | | t6050: show that git cat-file --batch fails with replace objectsChristian Couder2013-12-12
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'nd/negative-pathspec'Junio C Hamano2014-01-10
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |
| * | | | | | | | | | | Support pathspec magic :(exclude) and its short form :!Nguyễn Thái Ngọc Duy2013-12-06
* | | | | | | | | | | | Merge branch 'jk/name-pack-after-byte-representation'Junio C Hamano2013-12-27
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | pack-objects: name pack files after trailer hashJeff King2013-12-05
* | | | | | | | | | | | | Merge branch 'tg/diff-no-index-refactor'Junio C Hamano2013-12-27
|\ \ \ \ \ \ \ \ \ \ \ \ \