summaryrefslogtreecommitdiffstats
path: root/t (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bc/hash-independent-tests-part-6'Junio C Hamano2019-11-1014-155/+259
|\
| * t4048: abstract away SHA-1-specific constantsbrian m. carlson2019-10-281-26/+32
| * t4045: make hash-size independentbrian m. carlson2019-10-281-1/+1
| * t4044: update test to work with SHA-256brian m. carlson2019-10-281-16/+30
| * t4039: abstract away SHA-1-specific constantsbrian m. carlson2019-10-281-1/+2
| * t4038: abstract away SHA-1 specific constantsbrian m. carlson2019-10-281-6/+13
| * t4034: abstract away SHA-1-specific constantsbrian m. carlson2019-10-281-39/+54
| * t4027: make hash-size independentbrian m. carlson2019-10-281-8/+8
| * t4015: abstract away SHA-1-specific constantsbrian m. carlson2019-10-281-36/+53
| * t4011: abstract away SHA-1-specific constantsbrian m. carlson2019-10-281-12/+28
| * t4010: abstract away SHA-1-specific constantsbrian m. carlson2019-10-281-8/+12
| * t3429: remove SHA1 annotationbrian m. carlson2019-10-281-1/+1
| * t1305: avoid comparing extensionsbrian m. carlson2019-10-281-1/+1
| * rev-parse: add a --show-object-format optionbrian m. carlson2019-10-281-0/+15
| * t/oid-info: add empty tree and empty blob valuesbrian m. carlson2019-10-061-0/+6
| * t/oid-info: allow looking up hash algorithm namebrian m. carlson2019-10-061-0/+3
* | Merge branch 'js/update-index-ignore-removal-for-skip-worktree'Junio C Hamano2019-11-102-0/+26
|\ \
| * | stash: handle staged changes in skip-worktree files correctlyJohannes Schindelin2019-11-021-0/+11
| * | update-index: optionally leave skip-worktree entries aloneJohannes Schindelin2019-11-021-0/+15
* | | Merge branch 'pb/pretty-email-without-domain-part'Junio C Hamano2019-11-103-61/+97
|\ \ \
| * | | pretty: add "%aL" etc. to show local-part of email addressesPrarit Bhargava2019-10-303-4/+40
| * | | t4203: use test-lib.sh definitionsPrarit Bhargava2019-10-251-47/+47
| * | | t6006: use test-lib.sh definitionsPrarit Bhargava2019-10-251-10/+10
* | | | Merge branch 'dl/apply-3way-diff3'Junio C Hamano2019-11-101-26/+29
|\ \ \ \
| * | | | apply: respect merge.conflictStyle in --3wayDenton Liu2019-10-241-1/+1
| * | | | t4108: demonstrate bug in applyDenton Liu2019-10-241-2/+11
| * | | | t4108: use `test_config` instead of `git config`Denton Liu2019-10-241-1/+1
| * | | | t4108: remove git command upstream of pipeDenton Liu2019-10-241-6/+7
| * | | | t4108: replace create_file with test_write_linesDenton Liu2019-10-241-17/+10
| | |/ / | |/| |
* | | | Merge branch 'sg/dir-trie-fixes'Junio C Hamano2019-11-101-0/+2
|\ \ \ \
| * | | | path.c: don't call the match function without value in trie_find()SZEDER Gábor2019-10-231-0/+2
| |/ / /
* | | | Merge branch 'wb/midx-progress'Junio C Hamano2019-11-101-0/+69
|\ \ \ \
| * | | | multi-pack-index: add [--[no-]progress] option.William Baker2019-10-231-0/+69
* | | | | Merge branch 'en/merge-recursive-directory-rename-fixes'Junio C Hamano2019-11-103-313/+501
|\ \ \ \ \
| * | | | | t604[236]: do not run setup in separate testsElijah Newren2019-10-233-319/+393
| * | | | | merge-recursive: fix merging a subdirectory into the root directoryElijah Newren2019-10-231-0/+114
* | | | | | Merge branch 'dd/notes-copy-default-dst-to-head'Junio C Hamano2019-11-101-4/+42
|\ \ \ \ \ \
| * | | | | | notes: fix minimum number of parameters to "copy" subcommandDoan Tran Cong Danh2019-10-181-2/+38
| * | | | | | t3301: test diagnose messages for too few/many paramtersDoan Tran Cong Danh2019-10-181-2/+4
* | | | | | | Merge branch 'pw/post-commit-from-sequencer'Junio C Hamano2019-11-102-228/+396
|\ \ \ \ \ \ \
| * | | | | | | sequencer: run post-commit hookPhillip Wood2019-10-161-0/+19
| * | | | | | | t3404: remove uneeded calls to set_fake_editorPhillip Wood2019-10-162-20/+33
| * | | | | | | t3404: set $EDITOR in subshellPhillip Wood2019-10-161-204/+342
| * | | | | | | t3404: remove unnecessary subshellPhillip Wood2019-10-161-4/+2
* | | | | | | | Merge branch 'dl/format-patch-cover-from-desc'Junio C Hamano2019-11-102-1/+176
|\ \ \ \ \ \ \ \
| * | | | | | | | format-patch: teach --cover-from-description optionDenton Liu2019-10-162-1/+176
* | | | | | | | | Merge branch 'jt/fetch-pack-record-refs-in-the-dot-promisor'Junio C Hamano2019-11-101-0/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fetch-pack: write fetched refs to .promisorJonathan Tan2019-10-161-0/+8
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ds/commit-graph-on-fetch'Junio C Hamano2019-11-041-0/+16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | commit-graph: fix writing first commit-graph during fetchDerrick Stolee2019-10-251-1/+1