summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | | | 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
| | |_|_|_|_|/ / / | |/| | | | | | |