Merge branch 'dk/maint-blame-el'
Junio C Hamano committed almost 16 years ago
Junio C Hamano committed almost 16 years ago
t6022: Use -eq not = to test output of wc -l
Brian Gernhardt committed about 16 years ago
clean: remove redundant variable baselen
Nguyễn Thái Ngọc Duy committed almost 16 years ago
Provide 'git merge --abort' as a synonym to 'git reset --merge'
Johan Herland committed about 16 years ago
cmd_merge(): Parse options before checking MERGE_HEAD
Johan Herland committed about 16 years ago
Provide 'git notes get-ref' to easily retrieve current notes ref
Johan Herland committed about 16 years ago
git notes merge: Add testcases for merging notes trees at different fanouts
Johan Herland committed about 16 years ago
git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"
Johan Herland committed almost 16 years ago
git notes merge: --commit should fail if underlying notes ref has moved
Johan Herland committed about 16 years ago
git notes merge: List conflicting notes in notes merge commit message
Johan Herland committed about 16 years ago
git notes merge: Manual conflict resolution, part 2/2
Johan Herland committed about 16 years ago
git notes merge: Manual conflict resolution, part 1/2
Johan Herland committed about 16 years ago
Documentation: Preliminary docs on 'git notes merge'
Johan Herland committed about 16 years ago
git notes merge: Add automatic conflict resolvers (ours, theirs, union)
Johan Herland committed almost 16 years ago
git notes merge: Handle real, non-conflicting notes merges
Johan Herland committed almost 16 years ago
builtin/notes.c: Refactor creation of notes commits.
Johan Herland committed about 16 years ago
git notes merge: Initial implementation handling trivial merges only
Johan Herland committed about 16 years ago
builtin/notes.c: Split notes ref DWIMmery into a separate function
Johan Herland committed about 16 years ago
notes.c: Use two newlines (instead of one) when concatenating notes
Johan Herland committed about 16 years ago