path: root/notes-merge.c
AgeCommit message (Expand)Author
2016-06-28diff: convert struct diff_filespec to struct object_idbrian m. carlson
2016-06-02pathspec: rename free_pathspec() to clear_pathspec()Junio C Hamano
2015-11-20Remove get_object_hash.brian m. carlson
2015-11-20Convert struct object to object_idbrian m. carlson
2015-11-20Add several uses of get_object_hash.brian m. carlson
2015-08-10prefer git_pathdup to git_path in some possibly-dangerous casesJeff King
2015-05-11Merge branch 'nd/multiple-work-trees'Junio C Hamano
2015-01-07Merge branch 'jc/merge-bases'Junio C Hamano
2014-12-01path.c: make get_pathname() call sites return const char *Nguyễn Thái Ngọc Duy
2014-10-30get_merge_bases(): always clean-up object flagsJunio C Hamano
2014-10-15refs.c: change resolve_ref_unsafe reading argument to be a flags fieldRonnie Sahlberg
2014-06-13commit: record buffer length in cacheJeff King
2014-06-13use get_commit_buffer everywhereJeff King
2014-06-12replace dangerous uses of strbuf_attachJeff King
2014-06-12commit_tree: take a pointer/len pair rather than a const strbufJeff King
2013-07-15remove diff_tree_{setup,release}_pathsNguyễn Thái Ngọc Duy
2013-06-12Move create_notes_commit() from notes-merge.c into notes-utils.cJohan Herland
2012-08-22Merge branch 'tr/void-diff-setup-done'Junio C Hamano
2012-08-03diff_setup_done(): return voidThomas Rast
2012-06-07notes-merge: remove i18n legos in merge result messageNguyễn Thái Ngọc Duy
2012-03-15notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwdJohan Herland
2012-03-15notes-merge: use opendir/readdir instead of using read_directory()Johan Herland
2012-01-06Merge branch 'jc/show-sig'Junio C Hamano
2011-12-22Merge branch 'nd/war-on-nul-in-commit'Junio C Hamano
2011-12-15Convert commit_tree() to take strbuf as messageNguyễn Thái Ngọc Duy
2011-12-09Merge branch 'nd/resolve-ref'Junio C Hamano
2011-11-18Sync with C Hamano
2011-11-18Merge branch 'jn/maint-notes-avoid-va-args' into maintJunio C Hamano
2011-11-18notes merge: eliminate OUTPUT macroJonathan Nieder
2011-11-13Convert many resolve_ref() calls to read_ref*() and ref_exists()Nguyễn Thái Ngọc Duy
2011-11-13commit: teach --gpg-sign optionJunio C Hamano
2011-10-10Merge branch 'mh/maint-notes-merge-pathbuf-fix'Junio C Hamano
2011-10-05Change check_ref_format() to take a flags argumentMichael Haggerty
2011-09-27notes_merge_commit(): do not pass temporary buffer to other functionMichael Haggerty
2011-05-09index_fd(): turn write_object and format_check arguments into one flagJunio C Hamano
2011-03-22Fix sparse warningsStephen Boyd
2011-02-14correct type of EMPTY_TREE_SHA1_BINJonathan Nieder
2010-11-17git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"Johan Herland
2010-11-17git notes merge: List conflicting notes in notes merge commit messageJohan Herland
2010-11-17git notes merge: Manual conflict resolution, part 2/2Johan Herland
2010-11-17git notes merge: Manual conflict resolution, part 1/2Johan Herland
2010-11-17git notes merge: Add automatic conflict resolvers (ours, theirs, union)Johan Herland
2010-11-17git notes merge: Handle real, non-conflicting notes mergesJohan Herland
2010-11-17builtin/notes.c: Refactor creation of notes commits.Johan Herland
2010-11-17git notes merge: Initial implementation handling trivial merges onlyJohan Herland