summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bm/merge-base-octopus-dedup' into maintJunio C Hamano2014-02-131-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 'jc/revision-range-unpeel' into maintJunio C Hamano2014-02-131-0/+17
|\ \
| * | revision: propagate flag bits from tags to pointeesjc/revision-range-unpeelJunio C Hamano2014-01-151-0/+11
| * | revision: mark contents of an uninteresting tree uninterestingJunio C Hamano2014-01-151-0/+6
* | | Merge branch 'jk/allow-fetch-onelevel-refname' into maintJunio C Hamano2014-02-131-0/+11
|\ \ \
| * | | fetch-pack: do not filter out one-level refsjk/allow-fetch-onelevel-refnameJeff King2014-01-151-0/+11
| | |/ | |/|
* | | Merge branch 'jk/interpret-branch-name-fix' into maintJunio C Hamano2014-02-132-1/+51
|\ \ \
| * | | interpret_branch_name: find all possible @-marksjk/interpret-branch-name-fixJeff King2014-01-151-0/+21
| * | | interpret_branch_name: avoid @{upstream} past colonJeff King2014-01-151-0/+16
| * | | interpret_branch_name: always respect "namelen" parameterJeff King2014-01-151-1/+14
* | | | Merge branch 'as/tree-walk-fix-aggressive-short-cut' into maintJunio C Hamano2014-02-131-0/+13
|\ \ \ \
| * | | | tree_entry_interesting: match against all pathspecsas/tree-walk-fix-aggressive-short-cutAndy Spencer2014-01-271-0/+13
| | |/ / | |/| |
* | | | Merge branch 'ow/stash-with-ifs' into maintJunio C Hamano2014-02-051-0/+12
|\ \ \ \
| * | | | stash: handle specifying stashes with $IFSow/stash-with-ifsØystein Walle2014-01-071-0/+12
* | | | | Merge branch 'js/lift-parent-count-limit' into maintJunio C Hamano2014-02-052-1/+36
|\ \ \ \ \
| * | | | | Remove the line length limit for graft filesjs/lift-parent-count-limitJohannes Schindelin2013-12-272-1/+36
| |/ / / /
* | | | | Merge branch 'nd/add-empty-fix' into maintJunio C Hamano2014-02-051-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 'bc/log-decoration' into maintJunio C Hamano2014-02-051-0/+15
|\ \ \ \ \ \
| * | | | | | log: properly handle decorations with chained tagsbc/log-decorationbrian m. carlson2013-12-201-0/+15
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'jl/commit-v-strip-marker' into maintJunio C Hamano2014-02-051-1/+27
|\ \ \ \ \ \
| * | | | | | commit -v: strip diffs and submodule shortlogs from the commit messagejl/commit-v-strip-markerJens Lehmann2013-12-051-1/+27
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'tb/clone-ssh-with-colon-for-port' into maintJunio C Hamano2014-02-052-21/+198
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | connect.c: refactor url parsingTorsten Bögershausen2013-12-092-0/+15
| * | | | | git_connect(): refactor the port handling for sshTorsten Bögershausen2013-12-092-15/+4
| * | | | | git fetch: support host:/~repoTorsten Bögershausen2013-12-092-10/+26
| * | | | | t5500: add test cases for diag-urlTorsten Bögershausen2013-12-091-0/+59
| * | | | | t5601: add tests for sshTorsten Bögershausen2013-12-041-1/+99
| * | | | | t5601: remove clear_ssh, refactor setup_ssh_wrapperTorsten Bögershausen2013-12-041-20/+20
* | | | | | Merge branch 'mm/mv-file-to-no-such-dir-with-slash' into maintJunio C Hamano2014-01-131-0/+29
|\ \ \ \ \ \
| * | | | | | mv: let 'git mv file no-such-dir/' error outMatthieu Moy2013-12-041-0/+29
* | | | | | | Merge branch 'jk/rev-parse-double-dashes' into maintJunio C Hamano2014-01-131-0/+24
|\ \ \ \ \ \ \
| * | | | | | | rev-parse: correctly diagnose revision errors before "--"Jeff King2013-12-091-0/+24
| |/ / / / / /
* | | | | | | Merge branch 'jk/cat-file-regression-fix' into maintJunio C Hamano2014-01-131-0/+22
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | cat-file: handle --batch format with missing type/sizejk/cat-file-regression-fixJeff King2013-12-121-0/+22
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'jk/two-way-merge-corner-case-fix' into maintJunio C Hamano2013-12-172-89/+104
|\ \ \ \ \ \
| * | | | | | t1005: add test for "read-tree --reset -u A B"jk/two-way-merge-corner-case-fixJunio C Hamano2013-11-041-0/+15
| * | | | | | t1005: reindentJunio C Hamano2013-11-042-89/+89
* | | | | | | Merge branch 'sb/sha1-loose-object-info-check-existence' into maintJunio C Hamano2013-12-171-0/+6
|\ \ \ \ \ \ \
| * | | | | | | sha1_loose_object_info(): do not return success on missing objectsb/sha1-loose-object-info-check-existenceJunio C Hamano2013-11-061-0/+6
* | | | | | | | Merge branch 'nd/magic-pathspec' into maintJunio C Hamano2013-12-171-0/+6
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | diff: restrict pathspec limitations to diff b/f case onlynd/magic-pathspecNguyễn Thái Ngọc Duy2013-11-201-0/+6
* | | | | | | | Sync with 1.8.4.5Junio C Hamano2013-12-021-0/+15
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | / / | | |_|_|_|/ / | |/| | | | |
| * | | | | | submodule: do not copy unknown update mode from .gitmodulesJunio C Hamano2013-12-021-0/+15
| * | | | | | Merge branch 'jn/test-prereq-perl-doc' into maintJunio C Hamano2013-11-081-4/+11
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jc/upload-pack-send-symref' into maintJunio C Hamano2013-11-083-12/+17
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/http-auth-redirects' into maintJunio C Hamano2013-11-083-1/+15
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'mm/checkout-auto-track-fix' into maintJunio C Hamano2013-11-072-0/+27
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/split-broken-ident' into maintJunio C Hamano2013-11-071-2/+7
| |\ \ \ \ \ \ \ \ \ \
View Lorry Controller Status