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-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
2014-09-08
strbuf: use strbuf_addchars() for adding a char multiple times
René Scharfe
2014-08-13
merge-recursive.c: replace `git_config()` with `git_config_get_int()`
Tanay Abhra
2014-07-23
Merge branch 'ta/string-list-init'
Junio C Hamano
2014-07-21
replace memset with string-list initializers
Tanay Abhra
2014-07-16
Merge branch 'rs/code-cleaning'
Junio C Hamano
2014-07-16
Merge branch 'nd/split-index'
Junio C Hamano
2014-07-16
Merge branch 'jk/commit-buffer-length' into maint
Junio C Hamano
2014-07-11
use strbuf_addch for adding single characters
René Scharfe
2014-07-09
Merge branch 'jk/xstrfmt'
Junio C Hamano
2014-07-09
Merge branch 'jk/skip-prefix'
Junio C Hamano
2014-07-02
Merge branch 'jk/commit-buffer-length'
Junio C Hamano
2014-06-20
use skip_prefix to avoid repeating strings
Jeff King
2014-06-20
unique_path: fix unlikely heap overflow
Jeff King
2014-06-20
use xstrfmt to replace xmalloc + sprintf
Jeff King
2014-06-13
commit: record buffer length in cache
Jeff King
2014-06-13
use get_commit_buffer everywhere
Jeff King
2014-06-13
cache-tree: mark istate->cache_changed on cache tree update
Nguyễn Thái Ngọc Duy
[next]