aboutsummaryrefslogtreecommitdiff
path: root/notes-merge.c
Commit message (Expand)AuthorAge
* commit: record buffer length in cacheJeff King2014-06-13
* use get_commit_buffer everywhereJeff King2014-06-13
* replace dangerous uses of strbuf_attachJeff King2014-06-12
* commit_tree: take a pointer/len pair rather than a const strbufJeff King2014-06-12
* remove diff_tree_{setup,release}_pathsNguyễn Thái Ngọc Duy2013-07-15
* Move create_notes_commit() from notes-merge.c into notes-utils.cJohan Herland2013-06-12
* Merge branch 'tr/void-diff-setup-done'Junio C Hamano2012-08-22
|\
| * diff_setup_done(): return voidThomas Rast2012-08-03
* | notes-merge: remove i18n legos in merge result messageNguyễn Thái Ngọc Duy2012-06-07
* | notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwdJohan Herland2012-03-15
* | notes-merge: use opendir/readdir instead of using read_directory()Johan Herland2012-03-15
|/
* Merge branch 'jc/show-sig'Junio C Hamano2012-01-06
|\
| * commit: teach --gpg-sign optionJunio C Hamano2011-11-12
* | Merge branch 'nd/war-on-nul-in-commit'Junio C Hamano2011-12-22
|\ \
| * | Convert commit_tree() to take strbuf as messageNguyễn Thái Ngọc Duy2011-12-15
* | | Merge branch 'nd/resolve-ref'Junio C Hamano2011-12-09
|\ \ \ | |/ / |/| |
| * | Convert many resolve_ref() calls to read_ref*() and ref_exists()Nguyễn Thái Ngọc Duy2011-11-13
| |/
* | Sync with 1.7.7.4Junio C Hamano2011-11-18
|\ \ | |/ |/|
| * Merge branch 'jn/maint-notes-avoid-va-args' into maintJunio C Hamano2011-11-18
| |\
| | * notes merge: eliminate OUTPUT macroJonathan Nieder2011-11-17
* | | Merge branch 'mh/maint-notes-merge-pathbuf-fix'Junio C Hamano2011-10-10
|\ \ \ | |/ /
| * | notes_merge_commit(): do not pass temporary buffer to other functionMichael Haggerty2011-09-27
* | | Change check_ref_format() to take a flags argumentMichael Haggerty2011-10-05
|/ /
* | index_fd(): turn write_object and format_check arguments into one flagJunio C Hamano2011-05-09
* | Fix sparse warningsStephen Boyd2011-03-22
|/
* correct type of EMPTY_TREE_SHA1_BINJonathan Nieder2011-02-14
* git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"Johan Herland2010-11-17
* git notes merge: List conflicting notes in notes merge commit messageJohan Herland2010-11-17
* git notes merge: Manual conflict resolution, part 2/2Johan Herland2010-11-17
* git notes merge: Manual conflict resolution, part 1/2Johan Herland2010-11-17
* git notes merge: Add automatic conflict resolvers (ours, theirs, union)Johan Herland2010-11-17
* git notes merge: Handle real, non-conflicting notes mergesJohan Herland2010-11-17
* builtin/notes.c: Refactor creation of notes commits.Johan Herland2010-11-17
* git notes merge: Initial implementation handling trivial merges onlyJohan Herland2010-11-17