git.ipfire.org Git - thirdparty/git.git/history

]> git.ipfire.org Git - thirdparty/git.git/history - notes-merge.h

2010-11-17	Johan Herland	git notes merge: Manual conflict resolution, part 2/2	blob \| commitdiff \| raw
2010-11-17	Johan Herland	git notes merge: Manual conflict resolution, part 1/2	blob \| commitdiff \| raw \| diff to current
2010-11-17	Johan Herland	git notes merge: Add automatic conflict resolvers ...	blob \| commitdiff \| raw \| diff to current
2010-11-17	Johan Herland	git notes merge: Handle real, non-conflicting notes...	blob \| commitdiff \| raw \| diff to current
2010-11-17	Johan Herland	builtin/notes.c: Refactor creation of notes commits.	blob \| commitdiff \| raw \| diff to current
2010-11-17	Johan Herland	git notes merge: Initial implementation handling trivia...	blob \| commitdiff \| raw \| diff to current

Unnamed repository; edit this file 'description' to name the repository.