summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/reflog-walk' into maintJunio C Hamano2017-08-233-12/+136
|\
| * reflog-walk: apply --since/--until to reflog datesjk/reflog-walkJeff King2017-07-091-0/+26
| * reflog-walk: stop using fake parentsJeff King2017-07-092-8/+7
| * rev-list: check reflog_info before showing usageJeff King2017-07-091-0/+4
| * t1414: document some reflog-walk odditiesJeff King2017-07-072-10/+105
| * Merge branch 'jk/reflog-walk-maint' into jk/reflog-walkJunio C Hamano2017-07-072-0/+21
| |\
* | \ Merge branch 'jk/ref-filter-colors' into maintJunio C Hamano2017-08-236-72/+175
|\ \ \
| * | | 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 tag 'v2.13.5' into maintJunio C Hamano2017-08-044-2/+57
|\ \ \ \
| * \ \ \ Merge tag 'v2.12.4' into maintJunio C Hamano2017-08-014-2/+57
| |\ \ \ \
| | * \ \ \ Merge tag 'v2.11.3' into maint-2.12Junio C Hamano2017-07-303-0/+51
| | |\ \ \ \
| | | * \ \ \ Merge tag 'v2.10.4' into maint-2.11Junio C Hamano2017-07-303-0/+51
| | | |\ \ \ \
| | | | * \ \ \ Merge tag 'v2.9.5' into maint-2.10Junio C Hamano2017-07-303-0/+51
| | | | |\ \ \ \
| | | | | * \ \ \ Merge tag 'v2.8.6' into maint-2.9Junio C Hamano2017-07-303-0/+51
| | | | | |\ \ \ \
| | | | | | * \ \ \ Merge tag 'v2.7.6' into maint-2.8Junio C Hamano2017-07-303-0/+51
| | | | | | |\ \ \ \
| | | | | | | * | | | connect: reject paths that look like command line optionsJeff King2017-07-282-0/+37
| | | | | | | * | | | connect: reject dashed arguments for proxy commandsJeff King2017-07-281-0/+5
| | | | | | | * | | | t5813: add test for hostname starting with dashJeff King2017-07-281-0/+9
| | * | | | | | | | | t/lib-proto-disable: restore protocol.allow after config testsJeff King2017-07-281-2/+6
| * | | | | | | | | | Merge branch 'jk/test-copy-bytes-fix' into maintJunio C Hamano2017-07-311-0/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'pw/unquote-path-in-git-pm' into maintJunio C Hamano2017-07-311-0/+7
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/gc-pre-detach-under-hook' into maintJunio C Hamano2017-07-311-0/+21
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tb/push-to-cygwin-unc-path' into maintJunio C Hamano2017-07-311-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/alias-case-sensitivity' into maintJunio C Hamano2017-07-211-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mt/p4-parse-G-output'Junio C Hamano2017-07-201-0/+103
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | git-p4: filter for {'code':'info'} in p4CmdListmt/p4-parse-G-outputMiguel Torroja2017-07-131-2/+2
| * | | | | | | | | | | | | | | | git-p4: parse marshal output "p4 -G" in p4 changesMiguel Torroja2017-07-131-1/+1
| * | | | | | | | | | | | | | | | git-p4: git-p4 tests with p4 triggersMiguel Torroja2017-07-131-0/+103
* | | | | | | | | | | | | | | | | Merge branch 'jk/test-copy-bytes-fix'Junio C Hamano2017-07-201-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | t: handle EOF in test_copy_bytes()jk/test-copy-bytes-fixJeff King2017-07-171-0/+1
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'kn/ref-filter-branch-list' into maintJunio C Hamano2017-07-121-0/+44
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/reflog-walk-maint' into maintJunio C Hamano2017-07-122-0/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'js/alias-case-sensitivity'Junio C Hamano2017-07-201-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | alias: compare alias name *case-insensitively*js/alias-case-sensitivityJohannes Schindelin2017-07-171-1/+1
| * | | | | | | | | | | | | | | | t1300: demonstrate that CamelCased aliases regressedJohannes Schindelin2017-07-171-0/+7
* | | | | | | | | | | | | | | | | Merge branch 'jk/gc-pre-detach-under-hook'Junio C Hamano2017-07-181-0/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | gc: run pre-detach operations under lockjk/gc-pre-detach-under-hookJeff King2017-07-121-0/+21
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'js/fsck-name-object' into maintJunio C Hamano2017-07-101-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/t5534-rev-parse-gives-multi-line-output-fix' into maintJunio C Hamano2017-07-101-4/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cc/shared-index-permfix' into maintJunio C Hamano2017-07-103-11/+42
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ks/t7508-indent-fix' into maintJunio C Hamano2017-07-101-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/t4005-modernize' into maintJunio C Hamano2017-07-101-52/+43
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/apply-validate-input' into maintJunio C Hamano2017-07-103-1/+57
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pw/rebase-i-regression-fix-tests' into maintJunio C Hamano2017-07-102-5/+140
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/add-p-commentchar-fix' into maintJunio C Hamano2017-07-101-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/alias-early-config' into maintJunio C Hamano2017-07-103-1/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tb/push-to-cygwin-unc-path'Junio C Hamano2017-07-181-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |