aboutsummaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAge
* Merge branch 'rh/mergetool-regression-fix'Junio C Hamano2017-01-18
|\
| * mergetool: fix running in subdir when rerere enabledRichard Hansen2017-01-10
| * t7610: add test case for rerere+mergetool+subdir bugRichard Hansen2017-01-10
| * t7610: spell 'git reset --hard' consistentlyRichard Hansen2017-01-10
| * t7610: don't assume the checked-out commitRichard Hansen2017-01-10
| * t7610: always work on a test-specific branchRichard Hansen2017-01-10
| * t7610: delete some now-unnecessary 'git reset --hard' linesRichard Hansen2017-01-10
| * t7610: run 'git reset --hard' after each test to clean upRichard Hansen2017-01-10
| * t7610: don't rely on state from previous testRichard Hansen2017-01-10
| * t7610: use test_when_finished for cleanup tasksRichard Hansen2017-01-10
| * t7610: move setup code to the 'setup' test caseRichard Hansen2017-01-10
| * t7610: update branch names to match test numberRichard Hansen2017-01-10
* | Merge branch 'sb/pathspec-errors'Junio C Hamano2017-01-18
|\ \
| * | pathspec: give better message for submodule related pathspec errorStefan Beller2017-01-09
* | | Merge branch 'pb/test-must-fail-is-for-git'Junio C Hamano2017-01-18
|\ \ \
| * | | t9813: avoid using pipesPranit Bauva2017-01-09
| * | | don't use test_must_fail with grepPranit Bauva2017-01-07
| |/ /
* | | Merge branch 'js/mingw-test-push-unc-path'Junio C Hamano2017-01-18
|\ \ \
| * | | mingw: add a regression test for pushing to UNC pathsJohannes Schindelin2017-01-07
* | | | Merge branch 'km/branch-get-push-while-detached'Junio C Hamano2017-01-18
|\ \ \ \
| * | | | branch_get_push: do not segfault when HEAD is detachedKyle Meyer2017-01-07
* | | | | Merge branch 'jk/blame-fixes'Junio C Hamano2017-01-18
|\ \ \ \ \
| * | | | | blame: output porcelain "previous" header for each fileJeff King2017-01-07
| * | | | | blame: handle --no-abbrevJeff King2017-01-07
| * | | | | blame: fix alignment with --abbrev=40Jeff King2017-01-07
* | | | | | Merge branch 'jk/archive-zip-userdiff-config'Junio C Hamano2017-01-18
|\ \ \ \ \ \
| * | | | | | archive-zip: load userdiff configJeff King2017-01-07
| |/ / / / /
* | | | | | Merge branch 'dt/disable-bitmap-in-auto-gc'Junio C Hamano2017-01-18
|\ \ \ \ \ \
| * | | | | | repack: die on incremental + write-bitmap-indexDavid Turner2016-12-29
| * | | | | | auto gc: don't write bitmaps for incremental repacksDavid Turner2016-12-29
| |/ / / / /
| * | | | | Merge branch 'nd/test-helpers' into maintJunio C Hamano2016-11-29
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'as/merge-attr-sleep' into maintJunio C Hamano2016-11-29
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'mm/send-email-cc-cruft-after-address' into maintJunio C Hamano2016-11-29
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge branch 'sb/submodule-rm-absorb'Junio C Hamano2017-01-18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | rm: absorb a submodules git dir before deletionStefan Beller2016-12-27
* | | | | | | | | | Merge branch 'bw/grep-recurse-submodules'Junio C Hamano2017-01-18
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | grep: search history of moved submodulesBrandon Williams2016-12-22
| * | | | | | | | | | grep: enable recurse-submodules to work on <tree> objectsBrandon Williams2016-12-22
| * | | | | | | | | | grep: optionally recurse into submodulesBrandon Williams2016-12-22
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'sb/submodule-embed-gitdir'Junio C Hamano2017-01-10
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | submodule: add absorb-git-dir functionStefan Beller2016-12-12
| * | | | | | | | | test-lib-functions.sh: teach test_commit -C <dir>Stefan Beller2016-12-09
* | | | | | | | | | Merge branch 'mh/fast-import-notes-fix-new'Junio C Hamano2017-01-10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fast-import: properly fanout notes when tree is importedMike Hommey2016-12-20
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jc/compression-config'Junio C Hamano2017-01-10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | compression: unify pack.compression configuration parsingJunio C Hamano2016-11-15
* | | | | | | | | | | Merge branch 'dt/smart-http-detect-server-going-away'Junio C Hamano2017-01-10
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | upload-pack: optionally allow fetching any sha1David Turner2016-11-18
| * | | | | | | | | | remote-curl: don't hang when a server dies before any outputDavid Turner2016-11-18
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'ls/p4-lfs'Junio C Hamano2016-12-27
|\ \ \ \ \ \ \ \ \ \