index
:
org/kernel/git.git
master
forked from git/git
git
about
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
notes-merge.h
Commit message (
Expand
)
Author
Age
*
notes-merge: convert notes_merge* to struct object_id
Brandon Williams
2017-06-05
*
notes: extract enum notes_merge_strategy to notes-utils.h
Jacob Keller
2015-08-17
*
Move create_notes_commit() from notes-merge.c into notes-utils.c
Johan Herland
2013-06-12
*
Convert commit_tree() to take strbuf as message
Nguyễn Thái Ngọc Duy
2011-12-15
*
git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"
Johan Herland
2010-11-17
*
git notes merge: List conflicting notes in notes merge commit message
Johan Herland
2010-11-17
*
git notes merge: Manual conflict resolution, part 2/2
Johan Herland
2010-11-17
*
git notes merge: Manual conflict resolution, part 1/2
Johan Herland
2010-11-17
*
git notes merge: Add automatic conflict resolvers (ours, theirs, union)
Johan Herland
2010-11-17
*
git notes merge: Handle real, non-conflicting notes merges
Johan Herland
2010-11-17
*
builtin/notes.c: Refactor creation of notes commits.
Johan Herland
2010-11-17
*
git notes merge: Initial implementation handling trivial merges only
Johan Herland
2010-11-17
