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
2009-04-05
simplify output of conflicting merge
Clemens Buchacher
2009-04-05
update cache for conflicting submodule entries
Clemens Buchacher
2009-02-07
tree.c: allow read_tree_recursive() to traverse gitlink entries
Lars Hjemli
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
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
2008-01-21
Make on-disk index representation separate from in-core one
Linus Torvalds
2008-01-17
Improve use of lockfile API
Brandon Casey
2008-01-03
Fix grammar nits in documentation and in code comments.
Jim Meyering
2007-12-20
Improved submodule merge support
Finn Arne Gangstad
2007-12-11
Support a merge with conflicting gitlink change
Junio C Hamano
2007-11-12
Make the diff_options bitfields be an unsigned with explicit masks.
Pierre Habouzit
2007-10-29
Merge branch 'maint'
Junio C Hamano
2007-10-29
merge-recursive.c: mrtree in merge() is not used before set
Junio C Hamano
2007-10-03
Merge branch 'ph/strbuf'
Junio C Hamano
2007-09-27
Move make_cache_entry() from merge-recursive.c into read-cache.c
Carlos Rica
2007-09-26
Make merge-recursive honor diff.renamelimit
Lars Hjemli
2007-09-21
nfv?asprintf are broken without va_copy, workaround them.
Pierre Habouzit
2007-09-19
Use xmemdupz() in many places.
Pierre Habouzit
2007-09-13
Move make_cache_entry() from merge-recursive.c into read-cache.c
Carlos Rica
2007-08-15
Use xmkstemp() instead of mkstemp()
Luiz Fernando N. Capitulino
2007-08-15
merge-recursive: do not rudely die on binary merge
Junio C Hamano
2007-08-10
Start moving unpack-trees to "struct tree_desc"
Linus Torvalds
2007-06-13
-Wold-style-definition fix
Junio C Hamano
2007-06-05
merge-recursive: refuse to merge binary files
Johannes Schindelin
2007-04-27
Ignore merged status of the file-level merge
Alex Riesen
2007-04-26
Add a test for merging changed and rename-changed branches
Alex Riesen
2007-04-26
Avoid excessive rewrites in merge-recursive
Alex Riesen
2007-04-22
Merge branch 'jc/attr'
Junio C Hamano
2007-04-21
Fix bogus linked-list management for user defined merge drivers.
Junio C Hamano
2007-04-20
Kill the useless progress meter in merge-recursive
Shawn O. Pearce
2007-04-20
Fix working directory errno handling when unlinking a directory
Linus Torvalds
2007-04-19
Simplify code to find recursive merge driver.
Junio C Hamano
2007-04-19
Counto-fix in merge-recursive
Junio C Hamano
[next]