🌐 AI搜索 & 代理
🔍
主页
Sign in
chromium
/
external
/
github.com
/
git
/
git
/
refs/tags/v2.4.4
/
notes-merge.c
tag
0e67dadf9ddc04ecbc86a6b07bd041f31e43d98d
tagger
Junio C Hamano <gitster@pobox.com>
Tue Jun 16 21:38:08 2015
object
f09bd215cde5e30029fe08f309d0554eb9256778
Git 2.4.4
0985015
Merge branch 'jc/merge-bases'
by Junio C Hamano
· 11 years ago
2ce406c
get_merge_bases(): always clean-up object flags
by Junio C Hamano
· 11 years ago
7695d11
refs.c: change resolve_ref_unsafe reading argument to be a flags field
by Ronnie Sahlberg
· 11 years ago
8597ea3
commit: record buffer length in cache
by Jeff King
· 12 years ago
bc6b8fc
use get_commit_buffer everywhere
by Jeff King
· 12 years ago
e6dfcd6
replace dangerous uses of strbuf_attach
by Jeff King
· 12 years ago
3ffefb5
commit_tree: take a pointer/len pair rather than a const strbuf
by Jeff King
· 12 years ago
bd1928d
remove diff_tree_{setup,release}_paths
by Nguyễn Thái Ngọc Duy
· 12 years ago
bf9a05b
Move create_notes_commit() from notes-merge.c into notes-utils.c
by Johan Herland
· 13 years ago
9cd33bb
Merge branch 'tr/void-diff-setup-done'
by Junio C Hamano
· 13 years ago
2845265
diff_setup_done(): return void
by Thomas Rast
· 13 years ago
2ca0c53
notes-merge: remove i18n legos in merge result message
by Nguyễn Thái Ngọc Duy
· 14 years ago
dabba59
notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwd
by Johan Herland
· 14 years ago
a0be62c
notes-merge: use opendir/readdir instead of using read_directory()
by Johan Herland
· 14 years ago
5de89d3
Merge branch 'jc/show-sig'
by Junio C Hamano
· 14 years ago
f35ccd9
Merge branch 'nd/war-on-nul-in-commit'
by Junio C Hamano
· 14 years ago
13f8b72
Convert commit_tree() to take strbuf as message
by Nguyễn Thái Ngọc Duy
· 14 years ago
b7f7c07
Merge branch 'nd/resolve-ref'
by Junio C Hamano
· 14 years ago
4c00c85
Sync with 1.7.7.4
by Junio C Hamano
· 14 years ago
01e0f16
Merge branch 'jn/maint-notes-avoid-va-args' into maint
by Junio C Hamano
· 14 years ago
5f9f8d1
notes merge: eliminate OUTPUT macro
by Jonathan Nieder
· 14 years ago
c689332
Convert many resolve_ref() calls to read_ref*() and ref_exists()
by Nguyễn Thái Ngọc Duy
· 14 years ago
ba3c69a
commit: teach --gpg-sign option
by Junio C Hamano
· 14 years ago
e579a5d
Merge branch 'mh/maint-notes-merge-pathbuf-fix'
by Junio C Hamano
· 14 years ago
8d9c501
Change check_ref_format() to take a flags argument
by Michael Haggerty
· 14 years ago
8528445
notes_merge_commit(): do not pass temporary buffer to other function
by Michael Haggerty
· 14 years ago
c4ce46f
index_fd(): turn write_object and format_check arguments into one flag
by Junio C Hamano
· 15 years ago
c2e86ad
Fix sparse warnings
by Stephen Boyd
· 15 years ago
dab0d41
correct type of EMPTY_TREE_SHA1_BIN
by Jonathan Nieder
· 15 years ago
a6a0909
git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"
by Johan Herland
· 15 years ago
443259c
git notes merge: List conflicting notes in notes merge commit message
by Johan Herland
· 15 years ago
6abb365
git notes merge: Manual conflict resolution, part 2/2
by Johan Herland
· 15 years ago
809f38c
git notes merge: Manual conflict resolution, part 1/2
by Johan Herland
· 15 years ago
3228e67
git notes merge: Add automatic conflict resolvers (ours, theirs, union)
by Johan Herland
· 15 years ago
2085b16
git notes merge: Handle real, non-conflicting notes merges
by Johan Herland
· 15 years ago
5688184
builtin/notes.c: Refactor creation of notes commits.
by Johan Herland
· 15 years ago
75ef3f4
git notes merge: Initial implementation handling trivial merges only
by Johan Herland
· 15 years ago