summaryrefslogtreecommitdiff
path: root/notes-merge.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'va/i18n-more'Junio C Hamano2016-09-261-4/+4
|\
| * i18n: notes-merge: mark die messages for translationVasco Almeida2016-09-211-4/+4
* | Convert read_mmblob to take struct object_id.brian m. carlson2016-09-071-3/+3
* | notes-merge: convert struct notes_merge_pair to struct object_idbrian m. carlson2016-09-071-62/+65
|/
* Merge branch 'rs/notes-merge-no-toctou'Junio C Hamano2016-07-281-5/+1
|\
| * notes-merge: use O_EXCL to avoid overwriting existing filesrs/notes-merge-no-toctouRené Scharfe2016-07-071-5/+1
* | Merge branch 'bc/cocci'Junio C Hamano2016-07-191-21/+21
|\ \
| * | diff: convert struct diff_filespec to struct object_idbrian m. carlson2016-06-281-21/+21
| |/
* | pathspec: rename free_pathspec() to clear_pathspec()jc/clear-pathspecJunio C Hamano2016-06-021-2/+2
|/
* Remove get_object_hash.brian m. carlson2015-11-201-10/+10
* Convert struct object to object_idbrian m. carlson2015-11-201-2/+2
* Add several uses of get_object_hash.brian m. carlson2015-11-201-10/+10
* prefer git_pathdup to git_path in some possibly-dangerous casesJeff King2015-08-101-1/+2
* Merge branch 'nd/multiple-work-trees'Junio C Hamano2015-05-111-3/+3
|\
| * path.c: make get_pathname() call sites return const char *Nguyễn Thái Ngọc Duy2014-12-011-3/+3
* | Merge branch 'jc/merge-bases'Junio C Hamano2015-01-071-1/+1
|\ \ | |/ |/|
| * get_merge_bases(): always clean-up object flagsjc/merge-basesJunio C Hamano2014-10-301-1/+1
* | refs.c: change resolve_ref_unsafe reading argument to be a flags fieldRonnie Sahlberg2014-10-151-1/+1
|/
* commit: record buffer length in cacheJeff King2014-06-131-1/+1
* use get_commit_buffer everywhereJeff King2014-06-131-1/+3
* replace dangerous uses of strbuf_attachJeff King2014-06-121-4/+1
* commit_tree: take a pointer/len pair rather than a const strbufJeff King2014-06-121-2/+4
* remove diff_tree_{setup,release}_pathsNguyễn Thái Ngọc Duy2013-07-151-2/+2
* Move create_notes_commit() from notes-merge.c into notes-utils.cJohan Herland2013-06-121-26/+1
* Merge branch 'tr/void-diff-setup-done'Junio C Hamano2012-08-221-4/+2
|\
| * diff_setup_done(): return voidThomas Rast2012-08-031-4/+2
* | notes-merge: remove i18n legos in merge result messageNguyễn Thái Ngọc Duy2012-06-071-2/+4
* | notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwdjh/notes-merge-in-git-dir-worktreeJohan Herland2012-03-151-4/+9
* | notes-merge: use opendir/readdir instead of using read_directory()Johan Herland2012-03-151-20/+30
|/
* Merge branch 'jc/show-sig'Junio C Hamano2012-01-061-1/+1
|\
| * commit: teach --gpg-sign optionJunio C Hamano2011-11-121-1/+1
* | Merge branch 'nd/war-on-nul-in-commit'Junio C Hamano2011-12-221-4/+6
|\ \
| * | Convert commit_tree() to take strbuf as messageNguyễn Thái Ngọc Duy2011-12-151-4/+6
* | | Merge branch 'nd/resolve-ref'Junio C Hamano2011-12-091-1/+1
|\ \ \ | |/ / |/| |
| * | Convert many resolve_ref() calls to read_ref*() and ref_exists()Nguyễn Thái Ngọc Duy2011-11-131-1/+1
| |/
* | Sync with 1.7.7.4Junio C Hamano2011-11-181-43/+61
|\ \ | |/ |/|
| * Merge branch 'jn/maint-notes-avoid-va-args' into maintJunio C Hamano2011-11-181-43/+61
| |\
| | * notes merge: eliminate OUTPUT macrojn/maint-notes-avoid-va-argsJonathan Nieder2011-11-171-43/+61
* | | Merge branch 'mh/maint-notes-merge-pathbuf-fix'Junio C Hamano2011-10-101-1/+2
|\ \ \ | |/ /
| * | notes_merge_commit(): do not pass temporary buffer to other functionMichael Haggerty2011-09-271-1/+2
* | | Change check_ref_format() to take a flags argumentMichael Haggerty2011-10-051-2/+3
|/ /
* | index_fd(): turn write_object and format_check arguments into one flagJunio C Hamano2011-05-091-1/+1
* | Fix sparse warningsStephen Boyd2011-03-221-1/+1
|/
* correct type of EMPTY_TREE_SHA1_BINJonathan Nieder2011-02-141-1/+1
* git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"Johan Herland2010-11-171-0/+7
* git notes merge: List conflicting notes in notes merge commit messageJohan Herland2010-11-171-1/+10
* git notes merge: Manual conflict resolution, part 2/2Johan Herland2010-11-171-1/+70
* git notes merge: Manual conflict resolution, part 1/2Johan Herland2010-11-171-5/+161
* git notes merge: Add automatic conflict resolvers (ours, theirs, union)Johan Herland2010-11-171-1/+31
* git notes merge: Handle real, non-conflicting notes mergesJohan Herland2010-11-171-3/+322
View Lorry Controller Status