Welcome to
mirror list
, hosted at
ThFree Co
, Russian Federation.
github.com/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
index
:
github.com/git/git.git
jch
main
maint
master
next
seen
todo
Unnamed repository; edit this file 'description' to name the repository.
www-data
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
merge-recursive.c
Age
Commit message (
Expand
)
Author
2018-06-25
Merge branch 'sb/object-store-alloc'
Junio C Hamano
2018-06-25
Merge branch 'nd/commit-util-to-slab'
Junio C Hamano
2018-06-18
Merge branch 'en/rename-directory-detection'
Junio C Hamano
2018-06-14
merge-recursive: use xstrdup() instead of fixed buffer
René Scharfe
2018-06-13
Merge branch 'sb/submodule-merge-in-merge-recursive'
Junio C Hamano
2018-06-11
merge-submodule: reduce output verbosity
Leif Middelschulte
2018-05-30
Merge branch 'ma/unpack-trees-free-msgs'
Junio C Hamano
2018-05-30
Merge branch 'sb/submodule-merge-in-merge-recursive'
Junio C Hamano
2018-05-30
Merge branch 'js/use-bug-macro'
Junio C Hamano
2018-05-30
Merge branch 'bp/merge-rename-config'
Junio C Hamano
2018-05-23
Merge branch 'en/rename-directory-detection-reboot'
Junio C Hamano
2018-05-23
Merge branch 'ds/lazy-load-trees'
Junio C Hamano
2018-05-22
unpack_trees_options: free messages when done
Martin Ågren
2018-05-21
merge: use commit-slab in merge remote desc instead of commit->util
Nguyễn Thái Ngọc Duy
2018-05-21
merge-recursive: provide pair of `unpack_trees_{start,finish}()`
Elijah Newren
2018-05-18
merge-recursive: give notice when submodule commit gets fast-forwarded
Leif Middelschulte
2018-05-16
alloc: allow arbitrary repositories for alloc functions
Stefan Beller
2018-05-16
merge-recursive: i18n submodule merge output and respect verbosity
Stefan Beller
2018-05-16
submodule.c: move submodule merging to merge-recursive.c
Stefan Beller
2018-05-09
alloc: add repository argument to alloc_commit_node
Stefan Beller
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
[next]