🌐 AI搜索 & 代理
🔍
主页
Sign in
chromium
/
external
/
github.com
/
git
/
git
/
refs/tags/v2.20.5
/
merge.c
tag
7df1be854bdd4332abb5e042a336190e5e05b611
tagger
Junio C Hamano <gitster@pobox.com>
Mon Mar 08 20:08:11 2021
object
8b1a5f33d3ed427b0a6eaee595537805db6bc38c
Git 2.20.5
7e196c3
merge.c: remove implicit dependency on the_index
by Nguyễn Thái Ngọc Duy
· 7 years ago
c18ac30
Merge branch 'en/dirty-merge-fixes'
by Junio C Hamano
· 7 years ago
cffbfad
read-cache.c: move index_has_changes() from merge.c
by Elijah Newren
· 7 years ago
e47dbec
Merge branch 'ma/unpack-trees-free-msgs'
by Junio C Hamano
· 8 years ago
1c41d28
unpack_trees_options: free messages when done
by Martin Ågren
· 8 years ago
89e653d
merge: setup `opts` later in `checkout_fast_forward()`
by Martin Ågren
· 8 years ago
e9fe6f2
merge: convert empty tree constant to the_hash_algo
by brian m. carlson
· 8 years ago
5790d25
merge: always roll back lock in `checkout_fast_forward()`
by Martin Ågren
· 8 years ago
b6825b5
Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with-dirty-index
by Junio C Hamano
· 8 years ago
b101793
move index_has_changes() from builtin/am.c to merge.c for reuse
by Elijah Newren
· 8 years ago
df60cf5
read-cache: leave lock in right state in `write_locked_index()`
by Martin Ågren
· 8 years ago
837e34e
treewide: prefer lockfiles on the stack
by Martin Ågren
· 8 years ago
a9dbc17
tree: convert parse_tree_indirect to struct object_id
by brian m. carlson
· 9 years ago
f06e90d
merge: convert checkout_fast_forward to struct object_id
by brian m. carlson
· 9 years ago
3f061bf
lockfile: LOCK_REPORT_ON_ERROR
by Junio C Hamano
· 9 years ago
55f5704
sequencer: lib'ify checkout_fast_forward()
by Johannes Schindelin
· 9 years ago
f2fd076
Convert struct object to object_id
by brian m. carlson
· 10 years ago
697cc8e
lockfile.h: extract new header file for the functions in lockfile.c
by Michael Haggerty
· 11 years ago
788cef8
Merge branch 'nd/split-index'
by Junio C Hamano
· 11 years ago
5c1753b
merge: use argv_array when spawning merge strategy
by Jeff King
· 11 years ago
03b8664
read-cache: new API write_locked_index instead of write_index/write_cache
by Nguyễn Thái Ngọc Duy
· 12 years ago
db699a8
Move try_merge_command and checkout_fast_forward to libgit.a
by Nguyễn Thái Ngọc Duy
· 13 years ago