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
2019-05-08
Merge branch 'en/merge-directory-renames'
Junio C Hamano
2019-04-16
commit.cocci: refactor code, avoid double rewrite
Nguyễn Thái Ngọc Duy
2019-04-08
merge-recursive: switch directory rename detection default
Elijah Newren
2019-04-08
merge-recursive: give callers of handle_content_merge() access to contents
Elijah Newren
2019-04-08
merge-recursive: track information associated with directory renames
Elijah Newren
2019-04-08
merge-recursive: switch from (oid,mode) pairs to a diff_filespec
Elijah Newren
2019-04-08
merge-recursive: cleanup handle_rename_* function signatures
Elijah Newren
2019-04-08
merge-recursive: track branch where rename occurred in rename struct
Elijah Newren
2019-04-08
merge-recursive: remove ren[12]_other fields from rename_conflict_info
Elijah Newren
2019-04-08
merge-recursive: shrink rename_conflict_info
Elijah Newren
2019-04-08
merge-recursive: move some struct declarations together
Elijah Newren
2019-04-08
merge-recursive: use 'ci' for rename_conflict_info variable name
Elijah Newren
2019-04-08
merge-recursive: rename locals 'o' and 'a' to 'obuf' and 'abuf'
Elijah Newren
2019-04-08
merge-recursive: rename diff_filespec 'one' to 'o'
Elijah Newren
2019-04-08
merge-recursive: rename merge_options argument from 'o' to 'opt'
Elijah Newren
2019-04-08
Use 'unsigned short' for mode, like diff_filespec does
Elijah Newren
2019-04-01
submodule: avoid hard-coded constants
brian m. carlson
2019-03-07
Merge branch 'nd/completion-more-parameters'
Junio C Hamano
2019-02-20
completion: add more parameter value completion
Nguyễn Thái Ngọc Duy
2019-02-15
merge-recursive: drop several unused parameters
Jeff King
2019-02-07
Merge branch 'nd/the-index-final'
Junio C Hamano
2019-01-15
Merge branch 'nd/attr-pathspec-in-tree-walk'
Junio C Hamano
2019-01-14
read-cache.c: remove the_* from index_has_changes()
Nguyễn Thái Ngọc Duy
2019-01-14
merge-recursive.c: remove implicit dependency on the_repository
Nguyễn Thái Ngọc Duy
2019-01-14
merge-recursive.c: remove implicit dependency on the_index
Nguyễn Thái Ngọc Duy
2019-01-14
read-cache.c: kill read_index()
Nguyễn Thái Ngọc Duy
2019-01-14
repository.c: replace hold_locked_index() with repo_hold_locked_index()
Nguyễn Thái Ngọc Duy
2019-01-05
Merge branch 'en/merge-path-collision'
Junio C Hamano
2018-11-19
tree.c: make read_tree*() take 'struct repository *'
Nguyễn Thái Ngọc Duy
2018-11-08
merge-recursive: combine error handling
Derrick Stolee
2018-11-08
merge-recursive: improve rename/rename(1to2)/add[/add] handling
Elijah Newren
2018-11-08
merge-recursive: use handle_file_collision for add/add conflicts
Elijah Newren
2018-11-08
merge-recursive: improve handling for rename/rename(2to1) conflicts
Elijah Newren
2018-11-08
merge-recursive: fix rename/add conflict handling
Elijah Newren
2018-11-08
merge-recursive: new function for better colliding conflict resolutions
Elijah Newren
2018-11-08
merge-recursive: increase marker length with depth of recursion
Elijah Newren
2018-11-02
Merge branch 'en/merge-cleanup-more'
Junio C Hamano
2018-10-19
Merge branch 'nd/the-index'
Junio C Hamano
2018-10-18
merge-recursive: avoid showing conflicts with merge branch before HEAD
Elijah Newren
2018-10-18
merge-recursive: improve auto-merging messages with path collisions
Elijah Newren
2018-10-16
Merge branch 'en/merge-cleanup'
Junio C Hamano
2018-09-24
Merge branch 'en/double-semicolon-fix'
Junio C Hamano
2018-09-21
revision.c: remove implicit dependency on the_index
Nguyễn Thái Ngọc Duy
2018-09-21
ll-merge.c: remove implicit dependency on the_index
Nguyễn Thái Ngọc Duy
2018-09-21
diff.c: remove implicit dependency on the_index
Nguyễn Thái Ngọc Duy
2018-09-20
merge-recursive: rename merge_file_1() and merge_content()
Elijah Newren
2018-09-20
merge-recursive: remove final remaining caller of merge_file_one()
Elijah Newren
2018-09-20
merge-recursive: avoid wrapper function when unnecessary and wasteful
Elijah Newren
2018-09-20
merge-recursive: set paths correctly when three-way merging content
Elijah Newren
2018-09-17
Merge branch 'jk/cocci'
Junio C Hamano
[prev]
[next]