Sign in
googlers
/
jrn
/
git
/
d64bb065c0279e523db5270bbcf0ddda74fa9c8f
/
notes-merge.h
ef3ca95
Add missing includes and forward declarations
by Elijah Newren
· 7 years ago
5237e0e
notes-merge: convert notes_merge* to struct object_id
by Brandon Williams
· 8 years ago
4d03dd1
notes: extract enum notes_merge_strategy to notes-utils.h
by Jacob Keller
· 10 years ago
bf9a05b
Move create_notes_commit() from notes-merge.c into notes-utils.c
by Johan Herland
· 12 years ago
13f8b72
Convert commit_tree() to take strbuf as message
by Nguyễn Thái Ngọc Duy
· 13 years ago
a6a0909
git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"
by Johan Herland
· 14 years ago
443259c
git notes merge: List conflicting notes in notes merge commit message
by Johan Herland
· 14 years ago
6abb365
git notes merge: Manual conflict resolution, part 2/2
by Johan Herland
· 14 years ago
809f38c
git notes merge: Manual conflict resolution, part 1/2
by Johan Herland
· 14 years ago
3228e67
git notes merge: Add automatic conflict resolvers (ours, theirs, union)
by Johan Herland
· 14 years ago
2085b16
git notes merge: Handle real, non-conflicting notes merges
by Johan Herland
· 14 years ago
5688184
builtin/notes.c: Refactor creation of notes commits.
by Johan Herland
· 14 years ago
75ef3f4
git notes merge: Initial implementation handling trivial merges only
by Johan Herland
· 14 years ago