summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* stash: clean untracked files before resetnm/stash-untrackedNicolas Morey-Chaisemartin2017-08-111-0/+17
* 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | cygwin: allow pushing to UNC pathstb/push-to-cygwin-unc-pathTorsten Bögershausen2017-07-051-0/+2
| |/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/build-with-asan'Junio C Hamano2017-07-131-3/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | test-lib: turn on ASan abort_on_error by defaultJeff King2017-07-101-1/+1
| * | | | | | | | | | | | | | | | | | | | | test-lib: set ASAN_OPTIONS variable before we run gitJeff King2017-07-101-3/+8
| |/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/pull-rebase-submodule'Junio C Hamano2017-07-131-0/+58
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | pull: optionally rebase submodules (remote submodule changes only)Stefan Beller2017-06-231-0/+58
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/hashmap-customize-comparison'Junio C Hamano2017-07-131-7/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | hashmap.h: compare function has access to a data fieldStefan Beller2017-06-301-7/+12
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | 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