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-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-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
2010-01-18
git merge -X<option>
Avery Pennarun
2009-12-01
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-24
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-16
Check the format of more printf-type functions
Tarmigan Casebolt
2009-09-09
merge-recursive: give less scary messages when merge did not start
Junio C Hamano
2009-08-11
Merge branch 'jc/maint-merge-recursive-fix'
Junio C Hamano
2009-07-31
merge-recursive: don't segfault while handling rename clashes
Junio C Hamano
2009-07-06
Merge branch 'tr/die_errno'
Junio C Hamano
2009-07-02
Remove filename from conflict markers
Martin Renold
2009-06-27
Convert existing die(..., strerror(errno)) to die_errno()
Thomas Rast
2009-06-21
Fix various sparse warnings in the git source code
Linus Torvalds
2009-05-23
Merge branch 'do/maint-merge-recursive-fix'
Junio C Hamano
2009-05-10
merge-recursive: never leave index unmerged while recursing
Dave Olszewski
2009-04-30
merge-recursive: do not die on a conflicting submodule
Junio C Hamano
2009-04-08
Merge branch 'cb/maint-merge-recursive-submodule-fix'
Junio C Hamano
2009-04-05
simplify output of conflicting merge
Clemens Buchacher
2009-04-05
update cache for conflicting submodule entries
Clemens Buchacher
2009-03-16
Fix various dead stores found by the clang static analyzer
Benjamin Kramer
2009-02-07
tree.c: allow read_tree_recursive() to traverse gitlink entries
Lars Hjemli
2009-01-13
Merge branch 'js/maint-merge-recursive-r-d-conflict' into maint
Junio C Hamano
2009-01-13
Merge branch 'cb/maint-merge-recursive-fix' into maint
Junio C Hamano
2009-01-07
Merge branch 'js/maint-merge-recursive-r-d-conflict'
Junio C Hamano
2008-12-25
merge-recursive: mark rename/delete conflict as unmerged
Johannes Schindelin
2008-12-15
Merge branch 'cb/maint-merge-recursive-fix' into cb/merge-recursive-fix
Junio C Hamano
2008-12-05
Report symlink failures in merge-recursive
Alex Riesen
2008-11-24
merge-recursive: use strbuf_expand() instead of interpolate()
René Scharfe
2008-10-20
git-merge-recursive: honor merge.conflictstyle once again
Matt McCutchen
2008-10-12
Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer
Brandon Casey
2008-09-29
Merge branch 'bc/master-diff-hunk-header-fix'
Shawn O. Pearce
2008-09-26
Merge branch 'maint'
Shawn O. Pearce
2008-09-26
Cleanup remove_path
Alex Riesen
2008-09-05
merge-recursive: get rid of virtual_id
Miklos Vajna
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-05
merge-recursive: get rid of the index_only global variable
Miklos Vajna
2008-09-04
merge-recursive: move call_depth to struct merge_options
Miklos Vajna
[next]