Git 2.11

1. 8969fea Merge branch 'va/i18n-more' by Junio C Hamano · 9 years ago
2. c041c6d i18n: notes-merge: mark die messages for translation by Vasco Almeida · 9 years ago
3. d449347 Convert read_mmblob to take struct object_id. by brian m. carlson · 9 years ago
4. e910bb1 notes-merge: convert struct notes_merge_pair to struct object_id by brian m. carlson · 9 years ago
5. d0b6966 Merge branch 'rs/notes-merge-no-toctou' by Junio C Hamano · 9 years ago
6. a63d31b Merge branch 'bc/cocci' by Junio C Hamano · 9 years ago
7. deb9c15 notes-merge: use O_EXCL to avoid overwriting existing files by René Scharfe · 9 years ago
8. a0d12c4 diff: convert struct diff_filespec to struct object_id by brian m. carlson · 9 years ago
9. ed6e803 pathspec: rename free_pathspec() to clear_pathspec() by Junio C Hamano · 10 years ago
10. ed1c997 Remove get_object_hash. by brian m. carlson · 10 years ago
11. f2fd076 Convert struct object to object_id by brian m. carlson · 10 years ago
12. 7999b2c Add several uses of get_object_hash. by brian m. carlson · 10 years ago
13. fcd12db prefer git_pathdup to git_path in some possibly-dangerous cases by Jeff King · 10 years ago
14. 68a2e6a Merge branch 'nd/multiple-work-trees' by Junio C Hamano · 11 years ago
15. 0985015 Merge branch 'jc/merge-bases' by Junio C Hamano · 11 years ago
16. dcf6926 path.c: make get_pathname() call sites return const char * by Nguyễn Thái Ngọc Duy · 11 years ago
17. 2ce406c get_merge_bases(): always clean-up object flags by Junio C Hamano · 11 years ago
18. 7695d11 refs.c: change resolve_ref_unsafe reading argument to be a flags field by Ronnie Sahlberg · 11 years ago
19. 8597ea3 commit: record buffer length in cache by Jeff King · 12 years ago
20. bc6b8fc use get_commit_buffer everywhere by Jeff King · 12 years ago
21. e6dfcd6 replace dangerous uses of strbuf_attach by Jeff King · 12 years ago
22. 3ffefb5 commit_tree: take a pointer/len pair rather than a const strbuf by Jeff King · 12 years ago
23. bd1928d remove diff_tree_{setup,release}_paths by Nguyễn Thái Ngọc Duy · 12 years ago
24. bf9a05b Move create_notes_commit() from notes-merge.c into notes-utils.c by Johan Herland · 13 years ago
25. 9cd33bb Merge branch 'tr/void-diff-setup-done' by Junio C Hamano · 13 years ago
26. 2845265 diff_setup_done(): return void by Thomas Rast · 13 years ago
27. 2ca0c53 notes-merge: remove i18n legos in merge result message by Nguyễn Thái Ngọc Duy · 14 years ago
28. dabba59 notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwd by Johan Herland · 14 years ago
29. a0be62c notes-merge: use opendir/readdir instead of using read_directory() by Johan Herland · 14 years ago
30. 5de89d3 Merge branch 'jc/show-sig' by Junio C Hamano · 14 years ago
31. f35ccd9 Merge branch 'nd/war-on-nul-in-commit' by Junio C Hamano · 14 years ago
32. 13f8b72 Convert commit_tree() to take strbuf as message by Nguyễn Thái Ngọc Duy · 14 years ago
33. b7f7c07 Merge branch 'nd/resolve-ref' by Junio C Hamano · 14 years ago
34. 4c00c85 Sync with 1.7.7.4 by Junio C Hamano · 14 years ago
35. 01e0f16 Merge branch 'jn/maint-notes-avoid-va-args' into maint by Junio C Hamano · 14 years ago
36. 5f9f8d1 notes merge: eliminate OUTPUT macro by Jonathan Nieder · 14 years ago
37. c689332 Convert many resolve_ref() calls to read_ref*() and ref_exists() by Nguyễn Thái Ngọc Duy · 14 years ago
38. ba3c69a commit: teach --gpg-sign option by Junio C Hamano · 14 years ago
39. e579a5d Merge branch 'mh/maint-notes-merge-pathbuf-fix' by Junio C Hamano · 14 years ago
40. 8d9c501 Change check_ref_format() to take a flags argument by Michael Haggerty · 14 years ago
41. 8528445 notes_merge_commit(): do not pass temporary buffer to other function by Michael Haggerty · 14 years ago
42. c4ce46f index_fd(): turn write_object and format_check arguments into one flag by Junio C Hamano · 15 years ago
43. c2e86ad Fix sparse warnings by Stephen Boyd · 15 years ago
44. dab0d41 correct type of EMPTY_TREE_SHA1_BIN by Jonathan Nieder · 15 years ago
45. a6a0909 git notes merge: Add another auto-resolving strategy: "cat_sort_uniq" by Johan Herland · 15 years ago
46. 443259c git notes merge: List conflicting notes in notes merge commit message by Johan Herland · 15 years ago
47. 6abb365 git notes merge: Manual conflict resolution, part 2/2 by Johan Herland · 15 years ago
48. 809f38c git notes merge: Manual conflict resolution, part 1/2 by Johan Herland · 15 years ago
49. 3228e67 git notes merge: Add automatic conflict resolvers (ours, theirs, union) by Johan Herland · 15 years ago
50. 2085b16 git notes merge: Handle real, non-conflicting notes merges by Johan Herland · 15 years ago
51. 5688184 builtin/notes.c: Refactor creation of notes commits. by Johan Herland · 15 years ago
52. 75ef3f4 git notes merge: Initial implementation handling trivial merges only by Johan Herland · 15 years ago