index
:
org/kernel/git.git
master
forked from git/git
git
about
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
merge-recursive.c
Commit message (
Expand
)
Author
Age
...
*
|
|
|
Merge branch 'ks/recursive-rename-add-identical'
Junio C Hamano
2010-09-15
|
\
\
\
\
|
|
_
|
/
/
|
/
|
|
|
|
*
|
|
RE: [PATCH] Avoid rename/add conflict when contents are identical
Schalk, Ken
2010-09-03
*
|
|
|
Merge branch 'dg/local-mod-error-messages'
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-03
*
|
|
|
|
Merge branch 'jn/merge-renormalize'
Junio C Hamano
2010-09-03
|
\
\
\
\
\
|
|
|
_
|
/
/
|
|
/
|
|
|
|
*
|
|
|
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-08-06
|
*
|
|
|
Try normalizing files to avoid delete/modify conflicts when merging
Eyvind Bernhardsen
2010-07-02
|
|
|
_
|
/
|
|
/
|
|
*
|
|
|
Merge branch 'en/d-f-conflict-fix'
Junio C Hamano
2010-08-31
|
\
\
\
\
|
*
|
|
|
merge-recursive: Avoid excessive output for and reprocessing of renames
Elijah Newren
2010-08-20
|
*
|
|
|
merge-recursive: Fix multiple file rename across D/F conflict
Elijah Newren
2010-08-18
|
*
|
|
|
merge-recursive: Fix typo
Elijah Newren
2010-08-18
|
*
|
|
|
merge_recursive: Fix renames across paths below D/F conflicts
Elijah Newren
2010-07-09
|
*
|
|
|
merge-recursive: Fix D/F conflicts
Elijah Newren
2010-07-09
*
|
|
|
|
Merge branch 'hv/submodule-find-ff-merge'
Junio C Hamano
2010-08-21
|
\
\
\
\
\
|
*
|
|
|
|
Implement automatic fast-forward merge for submodules
Heiko Voigt
2010-07-07
*
|
|
|
|
|
Merge branch 'dg/local-mod-error-messages'
Junio C Hamano
2010-08-21
|
\
\
\
\
\
\
|
|
|
_
|
_
|
/
/
|
|
/
|
|
|
|
|
*
|
|
|
|
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-11
|
|
|
_
|
_
|
/
|
|
/
|
|
|
*
|
|
|
|
Merge branch 'tf/string-list-init'
Junio C Hamano
2010-08-18
|
\
\
\
\
\
|
*
|
|
|
|
string_list: Add STRING_LIST_INIT macro and make use of it.
Thiago Farina
2010-07-05
|
|
|
/
/
/
|
|
/
|
|
|
*
|
|
|
|
Merge branch 'cc/find-commit-subject'
Junio C Hamano
2010-08-18
|
\
\
\
\
\
|
|
_
|
/
/
/
|
/
|
|
|
|
|
*
|
|
|
merge-recursive: use find_commit_subject() instead of custom code
Christian Couder
2010-07-23
|
*
|
|
|
Merge branch 'pc/remove-warn' into maint
Junio C Hamano
2010-06-22
|
|
\
\
\
\
|
|
|
_
|
/
/
|
|
/
|
|
|
*
|
|
|
|
merge-recursive: use "up-to-date" instead of "uptodate" in error message for ...
Nicolas Sebrecht
2010-07-09
|
|
_
|
/
/
|
/
|
|
|
*
|
|
|
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-27
|
|
_
|
/
|
/
|
|
*
|
|
Merge branch 'pc/remove-warn'
Junio C Hamano
2010-05-08
|
\
\
\
|
|
/
/
|
/
|
/
|
|
/
|
*
Remove a redundant errno test in a usage of remove_path
Peter Collingbourne
2010-03-28
*
|
merge-recursive: add a label for ancestor
Jonathan Nieder
2010-03-20
*
|
merge_trees(): add ancestor label parameter for diff3-style output
Jonathan Nieder
2010-03-20
*
|
ll_merge(): add ancestor label parameter for diff3-style output
Jonathan Nieder
2010-03-20
|
/
*
refactor duplicated fill_mm() in checkout and merge-recursive
Michael Lukashov
2010-02-17
*
Merge branch 'maint'
Junio C Hamano
2010-01-21
|
\
|
*
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-20
|
\
\
|
|
/
|
/
|
|
*
Make "subtree" part more orthogonal to the rest of merge-recursive.
Junio C Hamano
2010-01-17
|
*
git merge -X<option>
Avery Pennarun
2010-01-17
*
|
Merge branch 'mm/maint-merge-ff-error-message-fix'
Junio C Hamano
2009-11-30
|
\
\
|
|
/
|
/
|
|
*
merge-recursive: make the error-message generation an extern function
Matthieu Moy
2009-11-29
*
|
Merge branch 'mm/maint-hint-failed-merge'
Junio C Hamano
2009-11-23
|
\
\
|
*
|
merge-recursive: point the user to commit when file would be overwritten.
Matthieu Moy
2009-11-22
|
|
/
*
|
Check the format of more printf-type functions
Tarmigan Casebolt
2009-11-15
|
/
*
merge-recursive: give less scary messages when merge did not start
Junio C Hamano
2009-09-08
[prev]
[next]