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-05-08
merge: pass aggressive when rename detection is turned off
Ben Peart
2018-05-08
merge: add merge.renames config setting
Ben Peart
2018-05-08
merge-recursive: fix check for skipability of working tree updates
Elijah Newren
2018-05-08
merge-recursive: make "Auto-merging" comment show for other merges
Elijah Newren
2018-05-08
merge-recursive: fix remainder of was_dirty() to use original index
Elijah Newren
2018-05-08
merge-recursive: fix was_tracked() to quit lying with some renamed paths
Elijah Newren
2018-05-08
merge-recursive: avoid triggering add_cacheinfo error with dirty mod
Elijah Newren
2018-05-08
merge-recursive: move more is_dirty handling to merge_content
Elijah Newren
2018-05-08
merge-recursive: improve add_cacheinfo error handling
Elijah Newren
2018-05-08
merge-recursive: avoid spurious rename/rename conflict from dir renames
Elijah Newren
2018-05-08
merge-recursive: fix remaining directory rename + dirty overwrite cases
Elijah Newren
2018-05-08
merge-recursive: fix overwriting dirty files involved in renames
Elijah Newren
2018-05-08
merge-recursive: avoid clobbering untracked files with directory renames
Elijah Newren
2018-05-08
merge-recursive: apply necessary modifications for directory renames
Elijah Newren
2018-05-08
merge-recursive: when comparing files, don't include trees
Elijah Newren
2018-05-08
merge-recursive: check for file level conflicts then get new name
Elijah Newren
2018-05-08
merge-recursive: add computation of collisions due to dir rename & merging
Elijah Newren
2018-05-08
merge-recursive: check for directory level conflicts
Elijah Newren
2018-05-08
merge-recursive: add get_directory_renames()
Elijah Newren
2018-05-06
Replace all die("BUG: ...") calls by BUG() ones
Johannes Schindelin
2018-04-20
merge-recursive: make a helper function for cleanup for handle_renames
Elijah Newren
2018-04-20
merge-recursive: split out code for determining diff_filepairs
Elijah Newren
2018-04-20
merge-recursive: make !o->detect_rename codepath more obvious
Elijah Newren
2018-04-20
merge-recursive: fix leaks of allocated renames and diff_filepairs
Elijah Newren
2018-04-20
merge-recursive: introduce new functions to handle rename logic
Elijah Newren
2018-04-20
merge-recursive: move the get_renames() function
Elijah Newren
2018-04-11
Revert "Merge branch 'en/rename-directory-detection'"
Junio C Hamano
2018-04-11
treewide: replace maybe_tree with accessor methods
Derrick Stolee
2018-04-11
treewide: rename tree to maybe_tree
Derrick Stolee
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
[prev]
[next]