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
2018-04-11
Revert "Merge branch 'en/rename-directory-detection'"
Junio C Hamano
2018-04-10
Merge branch 'bc/object-id'
Junio C Hamano
2018-04-10
Merge branch 'en/rename-directory-detection'
Junio C Hamano
2018-03-21
Merge branch 'rj/warning-uninitialized-fix'
Junio C Hamano
2018-03-20
-Wuninitialized: remove some 'init-self' workarounds
Ramsay Jones
2018-03-14
sha1_file: convert read_sha1_file to struct object_id
brian m. carlson
2018-03-14
tree-walk: convert tree entry functions to object_id
brian m. carlson
2018-03-14
strbuf: convert strbuf_add_unique_abbrev to use struct object_id
brian m. carlson
2018-03-14
tree: convert read_tree_recursive to struct object_id
brian m. carlson
2018-03-02
write_locked_index(): add flag to avoid writing unchanged index
Martin Ågren
2018-02-28
merge-recursive: always roll back lock in `merge_recursive_generic()`
Martin Ågren
2018-02-28
merge-recursive: ensure we write updates for directory-renamed file
Elijah Newren
2018-02-28
merge-recursive: avoid spurious rename/rename conflict from dir renames
Elijah Newren
2018-02-28
merge-recursive: fix remaining directory rename + dirty overwrite cases
Elijah Newren
2018-02-28
merge-recursive: fix overwriting dirty files involved in renames
Elijah Newren
2018-02-28
merge-recursive: avoid clobbering untracked files with directory renames
Elijah Newren
2018-02-28
merge-recursive: apply necessary modifications for directory renames
Elijah Newren
2018-02-16
Merge branch 'jc/merge-symlink-ours-theirs' into maint
Junio C Hamano
2018-02-16
Merge branch 'po/object-id'
Junio C Hamano
2018-02-16
Merge branch 'en/merge-recursive-fixes'
Junio C Hamano
2018-02-15
merge-recursive: when comparing files, don't include trees
Elijah Newren
2018-02-15
merge-recursive: check for file level conflicts then get new name
Elijah Newren
2018-02-15
merge-recursive: add computation of collisions due to dir rename & merging
Elijah Newren
2018-02-15
merge-recursive: check for directory level conflicts
Elijah Newren
2018-02-15
merge-recursive: add get_directory_renames()
Elijah Newren
2018-02-15
merge-recursive: make a helper function for cleanup for handle_renames
Elijah Newren
2018-02-15
merge-recursive: split out code for determining diff_filepairs
Elijah Newren
2018-02-15
merge-recursive: make !o->detect_rename codepath more obvious
Elijah Newren
2018-02-15
merge-recursive: fix leaks of allocated renames and diff_filepairs
Elijah Newren
2018-02-15
merge-recursive: introduce new functions to handle rename logic
Elijah Newren
2018-02-15
merge-recursive: move the get_renames() function
Elijah Newren
2018-01-30
sha1_file: convert write_sha1_file to object_id
Patryk Obara
2018-01-24
Merge branch 'jc/merge-symlink-ours-theirs'
Junio C Hamano
2018-01-20
merge-recursive: add explanation for src_entry and dst_entry
Elijah Newren
2018-01-20
merge-recursive: fix logic ordering issue
Elijah Newren
2018-01-09
Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with...
Junio C Hamano
2018-01-09
merge-recursive: do not look at the index during recursive merge
Junio C Hamano
2018-01-03
merge: teach -Xours/-Xtheirs to symbolic link merge
Junio C Hamano
2017-12-22
Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with...
Junio C Hamano
2017-12-22
merge-recursive: avoid incorporating uncommitted changes in a merge
Elijah Newren
2017-12-19
Merge branch 'en/merge-recursive-icase-removal'
Junio C Hamano
2017-12-14
Merge branch 'bc/hash-algo'
Junio C Hamano
2017-11-27
Merge branch 'sb/test-cherry-pick-submodule-getting-in-a-way'
Junio C Hamano
2017-11-27
Merge branch 'jc/ignore-cr-at-eol'
Junio C Hamano
2017-11-27
merge-recursive: ignore_case shouldn't reject intentional removals
Elijah Newren
2017-11-15
merge-recursive: handle addition of submodule on our side of history
Elijah Newren
2017-11-15
Merge branch 'ao/merge-verbosity-getenv-just-once'
Junio C Hamano
2017-11-13
Switch empty tree and blob lookups to use hash abstraction
brian m. carlson
2017-11-09
Merge branch 'bw/diff-opt-impl-to-bitfields'
Junio C Hamano
2017-11-08
diff: --ignore-cr-at-eol
Junio C Hamano
[next]