Welcome to
mirror list
, hosted at
ThFree Co
, Russian Federation.
git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
index
:
git.kernel.org/pub/scm/git/git.git
main
maint
master
next
seen
todo
Unnamed repository; edit this file 'description' to name the repository.
root
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
merge-recursive.c
Age
Commit message (
Expand
)
Author
2016-08-20
Merge branch 'rs/pull-signed-tag'
Junio C Hamano
2016-08-14
merge-recursive: fix verbose output for multiple base trees
René Scharfe
2016-08-12
Merge branch 'rs/merge-recursive-string-list-init'
Junio C Hamano
2016-08-06
merge-recursive: use STRING_LIST_INIT_NODUP
René Scharfe
2016-08-01
merge-recursive: flush output buffer even when erroring out
Johannes Schindelin
2016-08-01
merge_trees(): ensure that the callers release output buffer
Johannes Schindelin
2016-08-01
merge-recursive: offer an option to retain the output in 'obuf'
Johannes Schindelin
2016-08-01
merge-recursive: write the commit title in one go
Johannes Schindelin
2016-08-01
merge-recursive: flush output buffer before printing error messages
Johannes Schindelin
2016-07-26
merge-recursive: switch to returning errors instead of dying
Johannes Schindelin
2016-07-26
merge-recursive: handle return values indicating errors
Johannes Schindelin
2016-07-26
merge-recursive: allow write_tree_from_memory() to error out
Johannes Schindelin
2016-07-26
merge-recursive: avoid returning a wholesale struct
Johannes Schindelin
2016-07-26
merge_recursive: abort properly upon errors
Johannes Schindelin
2016-07-26
merge-recursive: clarify code in was_tracked()
Johannes Schindelin
2016-07-26
die(_("BUG")): avoid translating bug messages
Johannes Schindelin
2016-07-26
die("bug"): report bugs consistently
Johannes Schindelin
2016-07-26
Merge branch 'jc/renormalize-merge-kill-safer-crlf'
Junio C Hamano
2016-07-12
merge: avoid "safer crlf" during recording of merge results
Junio C Hamano
2016-06-28
merge-recursive: convert merge_recursive_generic() to object_id
brian m. carlson
2016-06-28
merge-recursive: convert leaf functions to use struct object_id
brian m. carlson
2016-06-28
merge-recursive: convert struct merge_file_info to object_id
brian m. carlson
2016-06-28
merge-recursive: convert struct stage_data to use object_id
brian m. carlson
2016-06-28
diff: convert struct diff_filespec to struct object_id
brian m. carlson
2016-05-07
Merge branch 'bc/object-id'
Junio C Hamano
2016-04-20
match-trees: convert shift_tree() and shift_tree_by() to use object_id
brian m. carlson
2016-04-13
merge-recursive: do not check working copy when creating a virtual merge base
Elijah Newren
2016-04-13
merge-recursive: remove duplicate code
Elijah Newren
2016-02-24
merge-recursive: find-renames resets threshold
Felipe Gonçalves Assis
2016-02-17
merge-recursive: more consistent interface
Felipe Gonçalves Assis
2016-02-17
merge-recursive: option to disable renames
Felipe Gonçalves Assis
2015-11-20
Remove get_object_hash.
brian m. carlson
2015-11-20
Convert struct object to object_id
brian m. carlson
2015-11-20
Add several uses of get_object_hash.
brian m. carlson
2015-10-30
Merge branch 'jk/delete-modechange-conflict'
Junio C Hamano
2015-10-27
merge: detect delete/modechange conflict
Jeff King
2015-10-05
merge-recursive: convert malloc / strcpy to strbuf
Jeff King
2015-05-20
use file_exists() to check if a file exists in the worktree
René Scharfe
2015-03-23
merge-recursive: fix memleaks
Stefan Beller
2015-01-07
Merge branch 'jc/merge-bases'
Junio C Hamano
2014-12-01
tree.c: update read_tree_recursive callback to pass strbuf as base
Nguyễn Thái Ngọc Duy
2014-10-30
get_merge_bases(): always clean-up object flags
Junio C Hamano
2014-10-14
Merge branch 'mh/lockfile'
Junio C Hamano
2014-10-14
Merge branch 'da/include-compat-util-first-in-c'
Junio C Hamano
2014-10-02
lockfile.h: extract new header file for the functions in lockfile.c
Michael Haggerty
2014-09-30
Merge branch 'sb/merge-recursive-copy-paste-fix'
Junio C Hamano
2014-09-23
merge-recursive: remove stale commented debugging code
Stefan Beller
2014-09-23
merge-recursive: fix copy-paste mistake
Stefan Beller
2014-09-19
Merge branch 'rs/export-strbuf-addchars'
Junio C Hamano
2014-09-15
cleanups: ensure that git-compat-util.h is included first
David Aguilar
[next]