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.h
Age
Commit message (
Expand
)
Author
2018-02-28
merge-recursive: fix overwriting dirty files involved in renames
Elijah Newren
2018-02-15
merge-recursive: add computation of collisions due to dir rename & merging
Elijah Newren
2018-02-15
merge-recursive: add get_directory_renames()
Elijah Newren
2017-09-08
merge-recursive: change current file dir string_lists to hashmap
Kevin Willford
2016-08-01
merge-recursive: offer an option to retain the output in 'obuf'
Johannes Schindelin
2016-06-28
merge-recursive: convert merge_recursive_generic() to object_id
brian m. carlson
2016-02-17
merge-recursive: option to disable renames
Felipe Gonçalves Assis
2012-10-29
Move try_merge_command and checkout_fast_forward to libgit.a
Nguyễn Thái Ngọc Duy
2011-08-15
merge-recursive: Save D/F conflict filenames instead of unlinking them
Elijah Newren
2011-03-20
Merge branch 'jk/merge-rename-ux'
Junio C Hamano
2011-02-21
merge: enable progress reporting for rename detection
Jeff King
2011-02-21
merge: improve inexact rename limit warning
Jeff King
2010-12-28
cherry-pick/revert: add support for -X/--strategy-option
Jonathan Nieder
2010-10-27
Merge branch 'kb/merge-recursive-rename-threshold'
Junio C Hamano
2010-10-27
Merge branch 'jf/merge-ignore-ws'
Junio C Hamano
2010-09-30
merge-recursive: option to specify rename threshold
Kevin Ballard
2010-09-04
Merge branch 'dg/local-mod-error-messages'
Junio C Hamano
2010-09-03
Merge branch 'jn/merge-renormalize'
Junio C Hamano
2010-09-03
Move set_porcelain_error_msgs to unpack-trees.c and rename it
Matthieu Moy
2010-08-26
merge-recursive --patience
Justin Frankel
2010-08-26
merge-recursive: expose merge options for builtin merge
Jonathan Nieder
2010-08-11
merge-recursive: porcelain messages for checkout
Diane Gasselin
2010-08-11
Turn unpack_trees_options.msgs into an array + enum
Matthieu Moy
2010-08-06
merge-trees: let caller decide whether to renormalize
Jonathan Nieder
2010-06-21
Merge branch 'gv/portable'
Junio C Hamano
2010-06-01
enums: omit trailing comma for portability
Gary V. Vaughan
2010-04-01
merge: make function try_merge_command non static
Christian Couder
2010-03-21
merge_trees(): add ancestor label parameter for diff3-style output
Jonathan Nieder
2010-01-21
Merge branch 'ap/merge-backend-opts'
Junio C Hamano
2010-01-18
Make "subtree" part more orthogonal to the rest of merge-recursive.
Junio C Hamano
2010-01-18
git merge -X<option>
Avery Pennarun
2009-11-30
merge-recursive: make the error-message generation an extern function
Matthieu Moy
2008-09-05
merge-recursive: move current_{file,directory}_set to struct merge_options
Miklos Vajna
2008-09-05
merge-recursive: move the global obuf to struct merge_options
Miklos Vajna
2008-09-04
merge-recursive: move call_depth to struct merge_options
Miklos Vajna
2008-08-31
merge-recursive: introduce merge_options
Miklos Vajna
2008-08-31
merge-recursive.c: Add more generic merge_recursive_generic()
Stephan Beyer
2008-08-31
Split out merge_recursive() to merge-recursive.c
Miklos Vajna
2008-02-10
Build-in merge-recursive
Daniel Barkalow