index
:
org/kernel/git.git
master
forked from git/git
git
about
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
notes-merge.c
Commit message (
Expand
)
Author
Age
*
Merge branch 'jc/merge-bases'
Junio C Hamano
2015-01-07
|
\
|
*
get_merge_bases(): always clean-up object flags
Junio C Hamano
2014-10-30
*
|
refs.c: change resolve_ref_unsafe reading argument to be a flags field
Ronnie Sahlberg
2014-10-15
|
/
*
commit: record buffer length in cache
Jeff King
2014-06-13
*
use get_commit_buffer everywhere
Jeff King
2014-06-13
*
replace dangerous uses of strbuf_attach
Jeff King
2014-06-12
*
commit_tree: take a pointer/len pair rather than a const strbuf
Jeff King
2014-06-12
*
remove diff_tree_{setup,release}_paths
Nguyễn Thái Ngọc Duy
2013-07-15
*
Move create_notes_commit() from notes-merge.c into notes-utils.c
Johan Herland
2013-06-12
*
Merge branch 'tr/void-diff-setup-done'
Junio C Hamano
2012-08-22
|
\
|
*
diff_setup_done(): return void
Thomas Rast
2012-08-03
*
|
notes-merge: remove i18n legos in merge result message
Nguyễn Thái Ngọc Duy
2012-06-07
*
|
notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwd
Johan Herland
2012-03-15
*
|
notes-merge: use opendir/readdir instead of using read_directory()
Johan Herland
2012-03-15
|
/
*
Merge branch 'jc/show-sig'
Junio C Hamano
2012-01-06
|
\
|
*
commit: teach --gpg-sign option
Junio C Hamano
2011-11-12
*
|
Merge branch 'nd/war-on-nul-in-commit'
Junio C Hamano
2011-12-22
|
\
\
|
*
|
Convert commit_tree() to take strbuf as message
Nguyễn Thái Ngọc Duy
2011-12-15
*
|
|
Merge branch 'nd/resolve-ref'
Junio C Hamano
2011-12-09
|
\
\
\
|
|
/
/
|
/
|
|
|
*
|
Convert many resolve_ref() calls to read_ref*() and ref_exists()
Nguyễn Thái Ngọc Duy
2011-11-13
|
|
/
*
|
Sync with 1.7.7.4
Junio C Hamano
2011-11-18
|
\
\
|
|
/
|
/
|
|
*
Merge branch 'jn/maint-notes-avoid-va-args' into maint
Junio C Hamano
2011-11-18
|
|
\
|
|
*
notes merge: eliminate OUTPUT macro
Jonathan Nieder
2011-11-17
*
|
|
Merge branch 'mh/maint-notes-merge-pathbuf-fix'
Junio C Hamano
2011-10-10
|
\
\
\
|
|
/
/
|
*
|
notes_merge_commit(): do not pass temporary buffer to other function
Michael Haggerty
2011-09-27
*
|
|
Change check_ref_format() to take a flags argument
Michael Haggerty
2011-10-05
|
/
/
*
|
index_fd(): turn write_object and format_check arguments into one flag
Junio C Hamano
2011-05-09
*
|
Fix sparse warnings
Stephen Boyd
2011-03-22
|
/
*
correct type of EMPTY_TREE_SHA1_BIN
Jonathan Nieder
2011-02-14
*
git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"
Johan Herland
2010-11-17
*
git notes merge: List conflicting notes in notes merge commit message
Johan Herland
2010-11-17
*
git notes merge: Manual conflict resolution, part 2/2
Johan Herland
2010-11-17
*
git notes merge: Manual conflict resolution, part 1/2
Johan Herland
2010-11-17
*
git notes merge: Add automatic conflict resolvers (ours, theirs, union)
Johan Herland
2010-11-17
*
git notes merge: Handle real, non-conflicting notes merges
Johan Herland
2010-11-17
*
builtin/notes.c: Refactor creation of notes commits.
Johan Herland
2010-11-17
*
git notes merge: Initial implementation handling trivial merges only
Johan Herland
2010-11-17
