summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'cc/untracked'Junio C Hamano2016-02-101-7/+82
|\
| * t7063: add tests for core.untrackedCacheChristian Couder2016-01-271-4/+81
| * config: add core.untrackedCacheChristian Couder2016-01-271-3/+1
* | Merge branch 'js/xmerge-marker-eol'Junio C Hamano2016-02-101-0/+13
|\ \
| * | merge-file: ensure that conflict sections match eol stylejs/xmerge-marker-eolJohannes Schindelin2016-01-271-1/+2
| * | merge-file: let conflict markers match end-of-line style of the contextJohannes Schindelin2016-01-271-0/+12
* | | Merge branch 'jk/ref-cache-non-repository-optim'Junio C Hamano2016-02-032-0/+11
|\ \ \
| * | | resolve_gitlink_ref: ignore non-repository pathsjk/ref-cache-non-repository-optimJeff King2016-01-252-0/+11
* | | | Merge branch 'js/dirname-basename'Junio C Hamano2016-02-031-0/+3
|\ \ \ \
| * | | | t0060: verify that basename() and dirname() work as expectedJohannes Schindelin2016-01-121-0/+3
| | |/ / | |/| |
* | | | Merge branch 'nd/diff-with-path-params'Junio C Hamano2016-02-031-0/+6
|\ \ \ \
| * | | | diff: make -O and --output work in subdirectorynd/diff-with-path-paramsDuy Nguyen2016-01-211-0/+6
| |/ / /
| * | | Merge branch 'jk/pending-keep-tag-name' into maintJunio C Hamano2016-01-041-0/+29
| |\ \ \
| * \ \ \ Merge branch 'jk/symbolic-ref-maint' into maintJunio C Hamano2016-01-041-0/+22
| |\ \ \ \
* | \ \ \ \ Merge branch 'tg/ls-remote-symref'Junio C Hamano2016-02-031-0/+45
|\ \ \ \ \ \
| * | | | | | ls-remote: add support for showing symrefstg/ls-remote-symrefThomas Gummerer2016-01-191-0/+45
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'tb/ls-files-eol'Junio C Hamano2016-02-031-21/+100
|\ \ \ \ \ \
| * | | | | | ls-files: add eol diagnosticstb/ls-files-eolTorsten Bögershausen2016-01-181-21/+100
* | | | | | | Merge branch 'jk/notes-merge-from-anywhere'Junio C Hamano2016-02-031-11/+11
|\ \ \ \ \ \ \
| * | | | | | | notes: allow merging from arbitrary referencesjk/notes-merge-from-anywhereJacob Keller2016-01-171-11/+11
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'jk/list-tag-2.7-regression'Junio C Hamano2016-02-013-52/+38
|\ \ \ \ \ \ \
| * | | | | | | tag: do not show ambiguous tag names as "tags/foo"jk/list-tag-2.7-regressionJeff King2016-01-263-0/+28
| * | | | | | | t6300: use test_atom for some un-modern testsJeff King2016-01-251-52/+10
| |/ / / / / /
* | | | | | | Merge branch 'jk/shortlog'Junio C Hamano2016-01-281-16/+6
|\ \ \ \ \ \ \
| * | | | | | | shortlog: don't warn on empty authorjk/shortlogJeff King2016-01-191-16/+0
| * | | | | | | shortlog: match both "Author:" and "author" on stdinJeff King2016-01-191-0/+6
| |/ / / / / /
* | | | | | | Merge branch 'tk/interpret-trailers-in-place'Junio C Hamano2016-01-281-0/+40
|\ \ \ \ \ \ \
| * | | | | | | interpret-trailers: add option for in-place editingtk/interpret-trailers-in-placeTobias Klauser2016-01-141-0/+40
| |/ / / / / /
* | | | | | | Merge branch 'jk/sanity'Junio C Hamano2016-01-281-5/+13
|\ \ \ \ \ \ \
| * | | | | | | test-lib: clarify and tighten SANITYjk/sanityJunio C Hamano2016-01-191-5/+13
* | | | | | | | Merge branch 'jk/filter-branch-no-index'Junio C Hamano2016-01-281-0/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | filter-branch: resolve $commit^{tree} in no-index casejk/filter-branch-no-indexJeff King2016-01-191-0/+8
* | | | | | | | | Merge branch 'jk/symbolic-ref'Junio C Hamano2016-01-262-0/+54
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | lock_ref_sha1_basic: handle REF_NODEREF with invalid refsjk/symbolic-refJeff King2016-01-132-0/+40
| * | | | | | | | | checkout,clone: check return value of create_symrefJeff King2016-01-121-0/+6
| * | | | | | | | | create_symref: use existing ref-lock codeJeff King2015-12-291-0/+8
* | | | | | | | | | Merge branch 'ak/format-patch-odir-config'Junio C Hamano2016-01-261-0/+15
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | format-patch: introduce format.outputDirectory configurationak/format-patch-odir-configAlexander Kuleshov2016-01-131-0/+15
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'rp/p4-filetype-change'Junio C Hamano2016-01-261-0/+66
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-p4.py: add support for filetype changerp/p4-filetype-changeRomain Picard2016-01-131-0/+66
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'js/close-packs-before-gc'Junio C Hamano2016-01-261-0/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fetch: release pack files before garbage-collectingJohannes Schindelin2016-01-131-0/+13
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'js/pull-rebase-i'Junio C Hamano2016-01-261-0/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | pull: allow interactive rebase with --rebase=interactiveJohannes Schindelin2016-01-131-0/+10
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'ep/shell-command-substitution-style'Junio C Hamano2016-01-2282-377/+377
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t9901-git-web--browse.sh: use the $( ... ) construct for command substitutionep/shell-command-substitution-styleElia Pinto2016-01-121-1/+1
| * | | | | | | | | | t9501-gitweb-standalone-http-status.sh: use the $( ... ) construct for comman...Elia Pinto2016-01-121-3/+3
| * | | | | | | | | | t9350-fast-export.sh: use the $( ... ) construct for command substitutionElia Pinto2016-01-121-3/+3
| * | | | | | | | | | t9300-fast-import.sh: use the $( ... ) construct for command substitutionElia Pinto2016-01-121-34/+34
| * | | | | | | | | | t9150-svk-mergetickets.sh: use the $( ... ) construct for command substitutionElia Pinto2016-01-121-1/+1
View Lorry Controller Status