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
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-15
Merge branch 'ks/recursive-rename-add-identical'
Junio C Hamano
2010-09-04
Merge branch 'dg/local-mod-error-messages'
Junio C Hamano
2010-09-03
RE: [PATCH] Avoid rename/add conflict when contents are identical
Schalk, Ken
2010-09-03
Merge branch 'jn/merge-renormalize'
Junio C Hamano
2010-09-03
setup_unpack_trees_porcelain: take the whole options struct as parameter
Matthieu Moy
2010-09-03
Move set_porcelain_error_msgs to unpack-trees.c and rename it
Matthieu Moy
2010-09-01
Merge branch 'en/d-f-conflict-fix'
Junio C Hamano
2010-08-27
merge-recursive: options to ignore whitespace changes
Justin Frankel
2010-08-26
merge-recursive --patience
Justin Frankel
2010-08-26
ll-merge: replace flag argument with options struct
Jonathan Nieder
2010-08-26
merge-recursive: expose merge options for builtin merge
Jonathan Nieder
2010-08-22
Merge branch 'hv/submodule-find-ff-merge'
Junio C Hamano
2010-08-22
Merge branch 'dg/local-mod-error-messages'
Junio C Hamano
2010-08-20
merge-recursive: Avoid excessive output for and reprocessing of renames
Elijah Newren
2010-08-18
Merge branch 'tf/string-list-init'
Junio C Hamano
2010-08-18
Merge branch 'cc/find-commit-subject'
Junio C Hamano
2010-08-18
merge-recursive: Fix multiple file rename across D/F conflict
Elijah Newren
2010-08-18
merge-recursive: Fix typo
Elijah Newren
2010-08-11
unpack_trees: group error messages by type
Matthieu Moy
2010-08-11
merge-recursive: distinguish "removed" and "overwritten" messages
Matthieu Moy
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-recursive --renormalize
Jonathan Nieder
2010-08-06
ll-merge: let caller decide whether to renormalize
Jonathan Nieder
2010-08-06
ll-merge: make flag easier to populate
Jonathan Nieder
2010-08-06
merge-trees: let caller decide whether to renormalize
Jonathan Nieder
2010-08-06
merge-trees: push choice to renormalize away from low level
Jonathan Nieder
2010-07-24
merge-recursive: use find_commit_subject() instead of custom code
Christian Couder
2010-07-10
merge-recursive: use "up-to-date" instead of "uptodate" in error message for ...
Nicolas Sebrecht
2010-07-10
merge_recursive: Fix renames across paths below D/F conflicts
Elijah Newren
2010-07-10
merge-recursive: Fix D/F conflicts
Elijah Newren
2010-07-07
Implement automatic fast-forward merge for submodules
Heiko Voigt
2010-07-05
string_list: Add STRING_LIST_INIT macro and make use of it.
Thiago Farina
2010-07-03
Try normalizing files to avoid delete/modify conflicts when merging
Eyvind Bernhardsen
2010-06-27
string_list: Fix argument order for string_list_lookup
Julian Phillips
2010-06-27
string_list: Fix argument order for string_list_insert
Julian Phillips
2010-06-22
Merge branch 'pc/remove-warn' into maint
Junio C Hamano
2010-05-09
Merge branch 'pc/remove-warn'
Junio C Hamano
2010-03-28
Remove a redundant errno test in a usage of remove_path
Peter Collingbourne
2010-03-21
merge-recursive: add a label for ancestor
Jonathan Nieder
2010-03-21
merge_trees(): add ancestor label parameter for diff3-style output
Jonathan Nieder
2010-03-21
ll_merge(): add ancestor label parameter for diff3-style output
Jonathan Nieder
2010-02-18
refactor duplicated fill_mm() in checkout and merge-recursive
Michael Lukashov
2010-01-22
Merge branch 'maint'
Junio C Hamano
2010-01-22
merge-recursive: do not return NULL only to cause segfault
Junio C Hamano
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
[next]