🌐 AI搜索 & 代理
🔍
主页
Sign in
chromium
/
external
/
github.com
/
git
/
git
/
refs/tags/v2.4.8
/
notes-merge.h
tag
a96a0c25f367a492881cacd5116f1afac1936152
tagger
Junio C Hamano <gitster@pobox.com>
Mon Aug 03 18:23:39 2015
object
8545932d45c91437ac439b1a2df12cf397f71311
Git 2.4.8
bf9a05b
Move create_notes_commit() from notes-merge.c into notes-utils.c
by Johan Herland
· 13 years ago
13f8b72
Convert commit_tree() to take strbuf as message
by Nguyễn Thái Ngọc Duy
· 14 years ago
a6a0909
git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"
by Johan Herland
· 15 years ago
443259c
git notes merge: List conflicting notes in notes merge commit message
by Johan Herland
· 15 years ago
6abb365
git notes merge: Manual conflict resolution, part 2/2
by Johan Herland
· 15 years ago
809f38c
git notes merge: Manual conflict resolution, part 1/2
by Johan Herland
· 15 years ago
3228e67
git notes merge: Add automatic conflict resolvers (ours, theirs, union)
by Johan Herland
· 15 years ago
2085b16
git notes merge: Handle real, non-conflicting notes merges
by Johan Herland
· 15 years ago
5688184
builtin/notes.c: Refactor creation of notes commits.
by Johan Herland
· 15 years ago
75ef3f4
git notes merge: Initial implementation handling trivial merges only
by Johan Herland
· 15 years ago