Google Git
Sign in
googlers / jrn / git / 62b42d348754231609e07912ac42da6b112008ef / notes-merge.c
  1. c2e86ad Fix sparse warnings by Stephen Boyd · 14 years ago
  2. dab0d41 correct type of EMPTY_TREE_SHA1_BIN by Jonathan Nieder · 14 years ago
  3. a6a0909 git notes merge: Add another auto-resolving strategy: "cat_sort_uniq" by Johan Herland · 14 years ago
  4. 443259c git notes merge: List conflicting notes in notes merge commit message by Johan Herland · 14 years ago
  5. 6abb365 git notes merge: Manual conflict resolution, part 2/2 by Johan Herland · 14 years ago
  6. 809f38c git notes merge: Manual conflict resolution, part 1/2 by Johan Herland · 14 years ago
  7. 3228e67 git notes merge: Add automatic conflict resolvers (ours, theirs, union) by Johan Herland · 14 years ago
  8. 2085b16 git notes merge: Handle real, non-conflicting notes merges by Johan Herland · 14 years ago
  9. 5688184 builtin/notes.c: Refactor creation of notes commits. by Johan Herland · 14 years ago
  10. 75ef3f4 git notes merge: Initial implementation handling trivial merges only by Johan Herland · 14 years ago