🌐 AI搜索 & 代理
🔍
主页
Sign in
chromium
/
external
/
github.com
/
git
/
git
/
refs/tags/v2.43.1
/
resolve-undo.c
tag
9c98e72e0329036735d6b873b88d0d840f5d8214
tagger
Junio C Hamano <gitster@pobox.com>
Fri Feb 09 00:22:52 2024
object
3526e67d917bcd03f317a058208fa02737654637
Git 2.43.1
5bb67fb
Merge branch 'jc/unresolve-removal'
by Junio C Hamano
· 2 years, 2 months ago
5bdedac
checkout: allow "checkout -m path" to unmerge removed paths
by Junio C Hamano
· 2 years, 4 months ago
fe83269
resolve-undo: allow resurrecting conflicted state that resolved to deletion
by Junio C Hamano
· 2 years, 4 months ago
bc5c5ec
cache.h: remove this no-longer-used header
by Elijah Newren
· 2 years, 6 months ago
08c46a4
read-cache*.h: move declarations for read-cache.c functions from cache.h
by Elijah Newren
· 2 years, 6 months ago
baf889c
sparse-index.h: move declarations for sparse-index.c from cache.h
by Elijah Newren
· 2 years, 6 months ago
d1cbe1e
hash-ll.h: split out of hash.h to remove dependency on repository.h
by Elijah Newren
· 2 years, 8 months ago
8e97852
Merge branch 'ds/sparse-index-protections'
by Junio C Hamano
· 4 years, 8 months ago
dc26b23
resolve-undo: ensure full index
by Derrick Stolee
· 4 years, 8 months ago
ca56dad
use CALLOC_ARRAY
by René Scharfe
· 4 years, 9 months ago
ff82d12
resolve-undo.c: use the right index instead of the_index
by Nguyễn Thái Ngọc Duy
· 7 years ago
6d2df28
dir.c: remove an implicit dependency on the_index in pathspec code
by Nguyễn Thái Ngọc Duy
· 7 years ago
a849735
block alloc: add lifecycle APIs for cache_entry structs
by Jameson Miller
· 7 years ago
825ed4d
read-cache: teach make_cache_entry to take object_id
by Jameson Miller
· 7 years ago
69d1242
cache: add a function to read an object ID from a buffer
by brian m. carlson
· 8 years ago
5ac913c
resolve-undo: convert struct resolve_undo_info to object_id
by brian m. carlson
· 8 years ago
99d1a98
cache: convert struct cache_entry to use struct object_id
by brian m. carlson
· 9 years ago
6c306a3
resolve-undo: be specific what part of the index has changed
by Nguyễn Thái Ngọc Duy
· 12 years ago
e636a7b
read-cache: be specific what part of the index has changed
by Nguyễn Thái Ngọc Duy
· 12 years ago
cbaeafc
Merge branch 'nd/submodule-pathspec-ending-with-slash'
by Junio C Hamano
· 12 years ago
429bb40
pathspec: convert some match_pathspec_depth() to ce_path_match()
by Nguyễn Thái Ngọc Duy
· 12 years ago
5699d17
read-cache.c: fix memory leaks caused by removed cache entries
by Karsten Blees
· 12 years ago
b02f5ae
Merge branch 'jl/submodule-mv'
by Junio C Hamano
· 12 years ago
5ab0651
convert unmerge_cache to take struct pathspec
by Nguyễn Thái Ngọc Duy
· 12 years ago
9c5e6c8
Convert "struct cache_entry *" to "const ..." wherever possible
by Nguyễn Thái Ngọc Duy
· 12 years ago
e721c15
checkout: avoid unnecessary match_pathspec calls
by Nguyễn Thái Ngọc Duy
· 13 years ago
8a57c6e
Convert the users of for_each_string_list to for_each_string_list_item macro
by Alex Riesen
· 15 years ago
e8c8b71
string_list: Fix argument order for string_list_lookup
by Julian Phillips
· 15 years ago
78a395d
string_list: Fix argument order for string_list_insert
by Julian Phillips
· 15 years ago
b684e97
string_list: Fix argument order for for_each_string_list
by Julian Phillips
· 15 years ago
b8bba41
build: make code "-Wpointer-arith" clean
by Junio C Hamano
· 16 years ago
4421a82
resolve-undo: "checkout -m path" uses resolve-undo information
by Junio C Hamano
· 16 years ago
cfc5789
resolve-undo: record resolved conflicts in a new index extension section
by Junio C Hamano
· 16 years ago