summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | diff: don't read index when --no-index is givenThomas Gummerer2013-12-122-0/+37
* | | Merge branch 'zk/difftool-counts'Junio C Hamano2013-12-271-0/+13
|\ \ \
| * | | difftool: display the number of files in the diff queue in the promptZoltan Klinger2013-12-061-0/+13
| |/ /
* | | Merge branch 'jk/cat-file-regression-fix'Junio C Hamano2013-12-271-0/+22
|\ \ \
| * | | cat-file: handle --batch format with missing type/sizejk/cat-file-regression-fixJeff King2013-12-121-0/+22
| |/ /
* | | Merge branch 'jk/pull-rebase-using-fork-point'Junio C Hamano2013-12-271-2/+4
|\ \ \
| * | | rebase: use reflog to find common base with upstreamJohn Keeping2013-12-101-2/+4
* | | | Merge branch 'jk/rev-parse-double-dashes'Junio C Hamano2013-12-271-0/+24
|\ \ \ \
| * | | | rev-parse: correctly diagnose revision errors before "--"Jeff King2013-12-091-0/+24
* | | | | Merge branch 'jc/push-refmap'Junio C Hamano2013-12-271-0/+75
|\ \ \ \ \
| * | | | | push: also use "upstream" mapping when pushing a single refjc/push-refmapJunio C Hamano2013-12-041-0/+30
| * | | | | push: use remote.$name.push as a refmapJunio C Hamano2013-12-041-0/+45
| |/ / / /
* | | | | Merge branch 'tb/clone-ssh-with-colon-for-port'Junio C Hamano2013-12-172-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 'jl/commit-v-strip-marker'Junio C Hamano2013-12-171-1/+27
|\ \ \ \ \ \
| * | | | | | commit -v: strip diffs and submodule shortlogs from the commit messagejl/commit-v-strip-markerJens Lehmann2013-12-051-1/+27
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'mm/mv-file-to-no-such-dir-with-slash'Junio C Hamano2013-12-171-0/+29
|\ \ \ \ \ \
| * | | | | | mv: let 'git mv file no-such-dir/' error outMatthieu Moy2013-12-041-0/+29
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'fc/trivial'Junio C Hamano2013-12-172-3/+1
|\ \ \ \ \ \
| * | | | | | t: trivial whitespace cleanupsFelipe Contreras2013-12-092-3/+1
* | | | | | | Merge branch 'jk/t5000-gzip-simplify'Junio C Hamano2013-12-171-16/+4
|\ \ \ \ \ \ \
| * | | | | | | t5000: simplify gzip prerequisite checksjk/t5000-gzip-simplifyJeff King2013-12-041-16/+4
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'jn/scripts-updates'Junio C Hamano2013-12-1232-41/+70
|\ \ \ \ \ \ \
| * | | | | | | remove #!interpreter line from shell librariesjn/scripts-updatesJonathan Nieder2013-11-261-4/+2
| * | | | | | | test: replace shebangs with descriptions in shell librariesJonathan Nieder2013-11-2615-20/+64
| * | | | | | | test: make FILEMODE a lazy prereqJonathan Nieder2013-11-268-17/+4
| * | | | | | | mark perl test scripts executableJonathan Nieder2013-11-2510-0/+0
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'jk/remove-deprecated'Junio C Hamano2013-12-123-25/+5
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Sync with 1.8.5jk/remove-deprecatedJunio C Hamano2013-12-052-11/+20
| |\ \ \ \ \ \ \ | | |/ / / / / /
| * | | | | | | tar-tree: remove deprecated commandJohn Keeping2013-11-123-25/+5
* | | | | | | | Merge branch 'tr/config-multivalue-lift-max'Junio C Hamano2013-12-121-0/+64
|\ \ \ \ \ \ \ \
| * | | | | | | | config: arbitrary number of matches for --unset and --replace-alltr/config-multivalue-lift-maxThomas Rast2013-12-061-0/+64
* | | | | | | | | Merge branch 'mh/fetch-tags-in-addition-to-normal-refs'Junio C Hamano2013-12-125-13/+148
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | fetch: improve the error messages emitted for conflicting refspecsmh/fetch-tags-in-addition-to-normal-refsMichael Haggerty2013-10-301-5/+9
| * | | | | | | | t5536: new test of refspec conflicts when fetchingMichael Haggerty2013-10-301-0/+96
| * | | | | | | | fetch --prune: prune only based on explicit refspecsMichael Haggerty2013-10-301-5/+5
| * | | | | | | | fetch --tags: fetch tags *in addition to* other stuffMichael Haggerty2013-10-304-8/+39
| * | | | | | | | t5510: check that "git fetch --prune --tags" does not prune branchesMichael Haggerty2013-10-241-0/+4
| * | | | | | | | t5510: prepare test refs more straightforwardlyMichael Haggerty2013-10-241-4/+4
| * | | | | | | | t5510: use the correct tag name in testMichael Haggerty2013-10-241-1/+1
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'jk/remove-experimental-loose-object-support'Junio C Hamano2013-12-0618-69/+0
|\ \ \ \ \ \ \ \