Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'bc/hash-independent-tests-part-6' | Junio C Hamano | 2019-11-10 | 14 | -155/+259 |
|\ | |||||
| * | t4048: abstract away SHA-1-specific constants | brian m. carlson | 2019-10-28 | 1 | -26/+32 |
| * | t4045: make hash-size independent | brian m. carlson | 2019-10-28 | 1 | -1/+1 |
| * | t4044: update test to work with SHA-256 | brian m. carlson | 2019-10-28 | 1 | -16/+30 |
| * | t4039: abstract away SHA-1-specific constants | brian m. carlson | 2019-10-28 | 1 | -1/+2 |
| * | t4038: abstract away SHA-1 specific constants | brian m. carlson | 2019-10-28 | 1 | -6/+13 |
| * | t4034: abstract away SHA-1-specific constants | brian m. carlson | 2019-10-28 | 1 | -39/+54 |
| * | t4027: make hash-size independent | brian m. carlson | 2019-10-28 | 1 | -8/+8 |
| * | t4015: abstract away SHA-1-specific constants | brian m. carlson | 2019-10-28 | 1 | -36/+53 |
| * | t4011: abstract away SHA-1-specific constants | brian m. carlson | 2019-10-28 | 1 | -12/+28 |
| * | t4010: abstract away SHA-1-specific constants | brian m. carlson | 2019-10-28 | 1 | -8/+12 |
| * | t3429: remove SHA1 annotation | brian m. carlson | 2019-10-28 | 1 | -1/+1 |
| * | t1305: avoid comparing extensions | brian m. carlson | 2019-10-28 | 1 | -1/+1 |
| * | rev-parse: add a --show-object-format option | brian m. carlson | 2019-10-28 | 1 | -0/+15 |
| * | t/oid-info: add empty tree and empty blob values | brian m. carlson | 2019-10-06 | 1 | -0/+6 |
| * | t/oid-info: allow looking up hash algorithm name | brian m. carlson | 2019-10-06 | 1 | -0/+3 |
* | | Merge branch 'js/update-index-ignore-removal-for-skip-worktree' | Junio C Hamano | 2019-11-10 | 2 | -0/+26 |
|\ \ | |||||
| * | | stash: handle staged changes in skip-worktree files correctly | Johannes Schindelin | 2019-11-02 | 1 | -0/+11 |
| * | | update-index: optionally leave skip-worktree entries alone | Johannes Schindelin | 2019-11-02 | 1 | -0/+15 |
* | | | Merge branch 'pb/pretty-email-without-domain-part' | Junio C Hamano | 2019-11-10 | 3 | -61/+97 |
|\ \ \ | |||||
| * | | | pretty: add "%aL" etc. to show local-part of email addresses | Prarit Bhargava | 2019-10-30 | 3 | -4/+40 |
| * | | | t4203: use test-lib.sh definitions | Prarit Bhargava | 2019-10-25 | 1 | -47/+47 |
| * | | | t6006: use test-lib.sh definitions | Prarit Bhargava | 2019-10-25 | 1 | -10/+10 |
* | | | | Merge branch 'dl/apply-3way-diff3' | Junio C Hamano | 2019-11-10 | 1 | -26/+29 |
|\ \ \ \ | |||||
| * | | | | apply: respect merge.conflictStyle in --3way | Denton Liu | 2019-10-24 | 1 | -1/+1 |
| * | | | | t4108: demonstrate bug in apply | Denton Liu | 2019-10-24 | 1 | -2/+11 |
| * | | | | t4108: use `test_config` instead of `git config` | Denton Liu | 2019-10-24 | 1 | -1/+1 |
| * | | | | t4108: remove git command upstream of pipe | Denton Liu | 2019-10-24 | 1 | -6/+7 |
| * | | | | t4108: replace create_file with test_write_lines | Denton Liu | 2019-10-24 | 1 | -17/+10 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'sg/dir-trie-fixes' | Junio C Hamano | 2019-11-10 | 1 | -0/+2 |
|\ \ \ \ | |||||
| * | | | | path.c: don't call the match function without value in trie_find() | SZEDER Gábor | 2019-10-23 | 1 | -0/+2 |
| |/ / / | |||||
* | | | | Merge branch 'wb/midx-progress' | Junio C Hamano | 2019-11-10 | 1 | -0/+69 |
|\ \ \ \ | |||||
| * | | | | multi-pack-index: add [--[no-]progress] option. | William Baker | 2019-10-23 | 1 | -0/+69 |
* | | | | | Merge branch 'en/merge-recursive-directory-rename-fixes' | Junio C Hamano | 2019-11-10 | 3 | -313/+501 |
|\ \ \ \ \ | |||||
| * | | | | | t604[236]: do not run setup in separate tests | Elijah Newren | 2019-10-23 | 3 | -319/+393 |
| * | | | | | merge-recursive: fix merging a subdirectory into the root directory | Elijah Newren | 2019-10-23 | 1 | -0/+114 |
* | | | | | | Merge branch 'dd/notes-copy-default-dst-to-head' | Junio C Hamano | 2019-11-10 | 1 | -4/+42 |
|\ \ \ \ \ \ | |||||
| * | | | | | | notes: fix minimum number of parameters to "copy" subcommand | Doan Tran Cong Danh | 2019-10-18 | 1 | -2/+38 |
| * | | | | | | t3301: test diagnose messages for too few/many paramters | Doan Tran Cong Danh | 2019-10-18 | 1 | -2/+4 |
* | | | | | | | Merge branch 'pw/post-commit-from-sequencer' | Junio C Hamano | 2019-11-10 | 2 | -228/+396 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | sequencer: run post-commit hook | Phillip Wood | 2019-10-16 | 1 | -0/+19 |
| * | | | | | | | t3404: remove uneeded calls to set_fake_editor | Phillip Wood | 2019-10-16 | 2 | -20/+33 |
| * | | | | | | | t3404: set $EDITOR in subshell | Phillip Wood | 2019-10-16 | 1 | -204/+342 |
| * | | | | | | | t3404: remove unnecessary subshell | Phillip Wood | 2019-10-16 | 1 | -4/+2 |
* | | | | | | | | Merge branch 'dl/format-patch-cover-from-desc' | Junio C Hamano | 2019-11-10 | 2 | -1/+176 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | format-patch: teach --cover-from-description option | Denton Liu | 2019-10-16 | 2 | -1/+176 |
* | | | | | | | | | Merge branch 'jt/fetch-pack-record-refs-in-the-dot-promisor' | Junio C Hamano | 2019-11-10 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | fetch-pack: write fetched refs to .promisor | Jonathan Tan | 2019-10-16 | 1 | -0/+8 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'ds/commit-graph-on-fetch' | Junio C Hamano | 2019-11-04 | 1 | -0/+16 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | commit-graph: fix writing first commit-graph during fetch | Derrick Stolee | 2019-10-25 | 1 | -1/+1 |