summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* ref-filter: consult want_color() before emitting colorsjk/ref-filter-colorsJeff King2017-07-133-11/+82
* pretty: respect color settings for %C placeholdersJeff King2017-07-131-34/+50
* rev-list: pass diffopt->use_colors through to pretty-printJeff King2017-07-131-0/+11
* t: use test_decode_color rather than literal ANSI codesJeff King2017-07-134-39/+44
* Merge branch 'kn/ref-filter-branch-list'Junio C Hamano2017-07-121-0/+44
|\
| * branch: use BRANCH_COLOR_LOCAL in ref-filter formatJeff King2017-07-091-0/+44
* | Merge branch 'jk/reflog-walk-maint'Junio C Hamano2017-07-102-0/+21
|\ \
| * | reflog-walk: don't free reflogs added to cacheJeff King2017-07-071-0/+4
| * | reflog-walk: duplicate strings in complete_reflogs listJeff King2017-07-071-0/+6
| * | reflog-walk: skip over double-null oid due to HEAD renameJeff King2017-07-051-0/+11
| * | Merge branch 'sd/t3200-branch-m-test' into maintJunio C Hamano2017-06-241-0/+17
| |\ \
| * \ \ Merge branch 'km/test-mailinfo-b-failure' into maintJunio C Hamano2017-06-241-0/+42
| |\ \ \
| * \ \ \ Merge branch 'ps/stash-push-pathspec-fix' into maintJunio C Hamano2017-06-241-0/+16
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/pack-idx-corruption-safety' into maintJunio C Hamano2017-06-241-1/+7
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/diff-blob' into maintJunio C Hamano2017-06-242-0/+105
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jc/name-rev-lw-tag' into maintJunio C Hamano2017-06-241-1/+1
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge branch 'ab/wildmatch'Junio C Hamano2017-07-101-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | wildmatch: remove unused wildopts parameterab/wildmatchÆvar Arnfjörð Bjarmason2017-06-231-3/+3
* | | | | | | | | | Merge branch 'pw/unquote-path-in-git-pm'Junio C Hamano2017-07-101-0/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t9700: add tests for Git::unquote_path()pw/unquote-path-in-git-pmPhillip Wood2017-06-301-0/+7
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'ks/commit-assuming-only-warning-removal'Junio C Hamano2017-07-101-0/+23
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | commit-template: distinguish status information unconditionallyks/commit-assuming-only-warning-removalKaartic Sivaraam2017-06-301-0/+23
* | | | | | | | | | | Merge branch 'js/t5534-rev-parse-gives-multi-line-output-fix'Junio C Hamano2017-07-061-4/+10
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t5534: fix misleading grep invocationjs/t5534-rev-parse-gives-multi-line-output-fixJohannes Schindelin2017-07-051-4/+10
* | | | | | | | | | | | Merge branch 'js/fsck-name-object'Junio C Hamano2017-07-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t1450: use egrep for regexp "alternation"js/fsck-name-objectJunio C Hamano2017-06-281-1/+1
* | | | | | | | | | | | | Merge branch 'cc/shared-index-permfix'Junio C Hamano2017-07-053-11/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t1700: make sure split-index respects core.sharedrepositorycc/shared-index-permfixChristian Couder2017-06-251-0/+30
| * | | | | | | | | | | | | t1301: move modebits() to test-lib-functions.shChristian Couder2017-06-252-11/+12
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'rs/sha1-name-readdir-optim'Junio C Hamano2017-07-051-0/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | p4205: add perf test script for pretty log formatsRené Scharfe2017-06-241-0/+16
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'bw/repo-object'Junio C Hamano2017-07-051-0/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | ls-files: use repository objectbw/repo-objectBrandon Williams2017-06-231-0/+39
| | | | | | | | | | | | | |
| | \ \ \ \ \ \ \ \ \ \ \ \
| *-. \ \ \ \ \ \ \ \ \ \ \ \ Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-ob...Junio C Hamano2017-06-235-1/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'vs/typofixes'Junio C Hamano2017-06-309-12/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Spelling fixesvs/typofixesVille Skyttä2017-06-279-12/+12
* | | | | | | | | | | | | | | | | Merge branch 'rs/apply-validate-input'Junio C Hamano2017-06-303-1/+57
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | apply: check git diffs for mutually exclusive header linesrs/apply-validate-inputRené Scharfe2017-06-271-0/+18
| * | | | | | | | | | | | | | | | | apply: check git diffs for invalid file modesRené Scharfe2017-06-271-1/+15
| * | | | | | | | | | | | | | | | | apply: check git diffs for missing old filenamesRené Scharfe2017-06-271-0/+24
* | | | | | | | | | | | | | | | | | Merge branch 'ks/status-initial-commit'Junio C Hamano2017-06-302-1/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | status: contextually notify user about an initial commitks/status-initial-commitKaartic Sivaraam2017-06-212-1/+31
| | |_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch 'ab/t3070-test-dedup' into maintJunio C Hamano2017-06-131-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jh/memihash-opt' into maintJunio C Hamano2017-06-131-5/+42
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tb/pull-ff-rebase-autostash' into maintJunio C Hamano2017-06-131-0/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sl/clean-d-ignored-fix' into maintJunio C Hamano2017-06-132-0/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/skip-test-in-the-middle' into maintJunio C Hamano2017-06-132-50/+56
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bw/forking-and-threading' into maintJunio C Hamano2017-06-132-2/+44
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/bug-to-abort' into maintJunio C Hamano2017-06-131-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/checkout-recurse-submodules' into maintJunio C Hamano2017-06-133-8/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status