diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-10-11 14:24:46 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-10-11 14:24:46 +0900 |
| commit | 676278f8ea1b9bdd8f235eceb739d7aec4f0ed67 (patch) | |
| tree | 1fffd7eb97b1f32a45e89d49ab3f9613265016d1 /Documentation/git-merge-one-file.txt | |
| parent | Merge branch 'en/clean-nested-with-ignored' (diff) | |
| parent | midx: switch to using the_hash_algo (diff) | |
| download | tgif-676278f8ea1b9bdd8f235eceb739d7aec4f0ed67.tar.xz | |
Merge branch 'bc/object-id-part17'
Preparation for SHA-256 upgrade continues.
* bc/object-id-part17: (26 commits)
midx: switch to using the_hash_algo
builtin/show-index: replace sha1_to_hex
rerere: replace sha1_to_hex
builtin/receive-pack: replace sha1_to_hex
builtin/index-pack: replace sha1_to_hex
packfile: replace sha1_to_hex
wt-status: convert struct wt_status to object_id
cache: remove null_sha1
builtin/worktree: switch null_sha1 to null_oid
builtin/repack: write object IDs of the proper length
pack-write: use hash_to_hex when writing checksums
sequencer: convert to use the_hash_algo
bisect: switch to using the_hash_algo
sha1-lookup: switch hard-coded constants to the_hash_algo
config: use the_hash_algo in abbrev comparison
combine-diff: replace GIT_SHA1_HEXSZ with the_hash_algo
bundle: switch to use the_hash_algo
connected: switch GIT_SHA1_HEXSZ to the_hash_algo
show-index: switch hard-coded constants to the_hash_algo
blame: remove needless comparison with GIT_SHA1_HEXSZ
...
Diffstat (limited to 'Documentation/git-merge-one-file.txt')
0 files changed, 0 insertions, 0 deletions