summaryrefslogtreecommitdiffstats
path: root/t (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mt/p4-parse-G-output'Junio C Hamano2017-07-211-0/+103
|\
| * git-p4: filter for {'code':'info'} in p4CmdListMiguel 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-211-0/+1
|\ \
| * | t: handle EOF in test_copy_bytes()Jeff King2017-07-171-0/+1
| * | Merge branch 'kn/ref-filter-branch-list' into maintJunio C Hamano2017-07-131-0/+44
| |\ \
| * \ \ Merge branch 'jk/reflog-walk-maint' into maintJunio C Hamano2017-07-132-0/+21
| |\ \ \
* | \ \ \ Merge branch 'js/alias-case-sensitivity'Junio C Hamano2017-07-211-0/+7
|\ \ \ \ \
| * | | | | alias: compare alias name *case-insensitively*Johannes 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 lockJeff 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 pathsTorsten Bögershausen2017-07-051-0/+2
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'jk/build-with-asan'Junio C Hamano2017-07-141-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-141-0/+58
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | pull: optionally rebase submodules (remote submodule changes only)Stefan Beller2017-06-241-0/+58
* | | | | | | | | | | | | | | Merge branch 'sb/hashmap-customize-comparison'Junio C Hamano2017-07-141-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-131-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-251-0/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'km/test-mailinfo-b-failure' into maintJunio C Hamano2017-06-251-0/+42
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ps/stash-push-pathspec-fix' into maintJunio C Hamano2017-06-251-0/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/pack-idx-corruption-safety' into maintJunio C Hamano2017-06-251-1/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/diff-blob' into maintJunio C Hamano2017-06-252-0/+105
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/name-rev-lw-tag' into maintJunio C Hamano2017-06-251-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ab/wildmatch'Junio C Hamano2017-07-101-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | wildmatch: remove unused wildopts parameterÆvar Arnfjörð Bjarmason2017-06-241-3/+3
| | |_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'pw/unquote-path-in-git-pm'Junio C Hamano2017-07-101-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | t9700: add tests for Git::unquote_path()Phillip 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 unconditionallyKaartic Sivaraam2017-06-301-0/+23
* | | | | | | | | | | | | | | | | | | | | Merge branch 'js/t5534-rev-parse-gives-multi-line-output-fix'Junio C Hamano2017-07-071-4/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | |