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-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-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
2018-09-17
Merge branch 'ds/reachable'
Junio C Hamano
2018-09-05
Remove superfluous trailing semicolons
Elijah Newren
2018-09-05
Merge branch 'en/directory-renames-nothanks'
Junio C Hamano
2018-08-30
merge-recursive: add ability to turn off directory rename detection
Elijah Newren
2018-08-29
convert "oidcmp() == 0" to oideq()
Jeff King
2018-08-20
Merge branch 'nd/no-the-index'
Junio C Hamano
2018-08-16
Merge branch 'en/merge-recursive-skip-fix'
Junio C Hamano
2018-08-14
convert.c: remove an implicit dependency on the_index
Nguyễn Thái Ngọc Duy
2018-08-03
Merge branch 'en/dirty-merge-fixes'
Junio C Hamano
2018-08-03
Merge branch 'jm/cache-entry-from-mem-pool'
Junio C Hamano
2018-08-03
Merge branch 'sb/object-store-lookup'
Junio C Hamano
2018-07-27
merge-recursive: preserve skip_worktree bit when necessary
Elijah Newren
2018-07-21
commit.h: remove method declarations
Derrick Stolee
2018-07-18
Merge branch 'sb/object-store-grafts'
Junio C Hamano
2018-07-18
Merge branch 'en/merge-recursive-cleanup'
Junio C Hamano
2018-07-11
merge-recursive: enforce rule that index matches head before merging
Elijah Newren
2018-07-11
merge-recursive: fix assumption that head tree being merged is HEAD
Elijah Newren
2018-07-11
merge-recursive: make sure when we say we abort that we actually abort
Elijah Newren
2018-07-03
index_has_changes(): avoid assuming operating on the_index
Elijah Newren
2018-07-03
block alloc: add lifecycle APIs for cache_entry structs
Jameson Miller
2018-07-03
read-cache: teach make_cache_entry to take object_id
Jameson Miller
2018-07-03
read-cache: teach refresh_cache_entry to take istate
Jameson Miller
2018-06-29
tag: add repository argument to deref_tag
Stefan Beller
[next]