aboutsummaryrefslogtreecommitdiff
path: root/merge-recursive.c
Commit message (Expand)AuthorAge
* Merge branch 'tr/die_errno'Junio C Hamano2009-07-06
|\
| * Convert existing die(..., strerror(errno)) to die_errno()Thomas Rast2009-06-27
* | Remove filename from conflict markersMartin Renold2009-07-01
* | Fix various sparse warnings in the git source codeLinus Torvalds2009-06-20
|/
* Merge branch 'do/maint-merge-recursive-fix'Junio C Hamano2009-05-23
|\
| * merge-recursive: never leave index unmerged while recursingDave Olszewski2009-05-09
* | merge-recursive: do not die on a conflicting submoduleJunio C Hamano2009-04-29
* | Merge branch 'cb/maint-merge-recursive-submodule-fix'Junio C Hamano2009-04-07
|\ \ | |/
| * simplify output of conflicting mergeClemens Buchacher2009-04-05
| * update cache for conflicting submodule entriesClemens Buchacher2009-04-05
* | Fix various dead stores found by the clang static analyzerBenjamin Kramer2009-03-15
|/
* tree.c: allow read_tree_recursive() to traverse gitlink entriesLars Hjemli2009-02-07
* Merge branch 'js/maint-merge-recursive-r-d-conflict'Junio C Hamano2009-01-07
|\
| * merge-recursive: mark rename/delete conflict as unmergedJohannes Schindelin2008-12-24
* | Merge branch 'cb/maint-merge-recursive-fix' into cb/merge-recursive-fixJunio C Hamano2008-12-15
|\ \ | |/ |/|
* | Report symlink failures in merge-recursiveAlex Riesen2008-12-04
* | merge-recursive: use strbuf_expand() instead of interpolate()René Scharfe2008-11-23
* | git-merge-recursive: honor merge.conflictstyle once againMatt McCutchen2008-10-19
* | Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializerBrandon Casey2008-10-12
* | Merge branch 'bc/master-diff-hunk-header-fix'Shawn O. Pearce2008-09-29
|\ \ | |/
* | Merge branch 'maint'Shawn O. Pearce2008-09-26
|\ \ | |/
* | Cleanup remove_pathAlex Riesen2008-09-26
* | merge-recursive: get rid of virtual_idMiklos Vajna2008-09-05
* | merge-recursive: move current_{file,directory}_set to struct merge_optionsMiklos Vajna2008-09-04
* | merge-recursive: move the global obuf to struct merge_optionsMiklos Vajna2008-09-04
* | merge-recursive: get rid of the index_only global variableMiklos Vajna2008-09-04
* | merge-recursive: move call_depth to struct merge_optionsMiklos Vajna2008-09-03
* | merge-recursive: introduce merge_optionsMiklos Vajna2008-08-30
* | merge-recursive.c: Add more generic merge_recursive_generic()Stephan Beyer2008-08-30
* | Split out merge_recursive() to merge-recursive.cMiklos Vajna2008-08-30
|/
* Build-in merge-recursiveDaniel Barkalow2008-02-09
* Make on-disk index representation separate from in-core oneLinus Torvalds2008-01-21
* Improve use of lockfile APIBrandon Casey2008-01-16
* Fix grammar nits in documentation and in code comments.Jim Meyering2008-01-03
* Improved submodule merge supportFinn Arne Gangstad2007-12-19
* Support a merge with conflicting gitlink changeJunio C Hamano2007-12-11
* Make the diff_options bitfields be an unsigned with explicit masks.Pierre Habouzit2007-11-11
* Merge branch 'maint'Junio C Hamano2007-10-29
|\
| * merge-recursive.c: mrtree in merge() is not used before setJunio C Hamano2007-10-29
| * Move make_cache_entry() from merge-recursive.c into read-cache.cCarlos Rica2007-09-26
* | Merge branch 'ph/strbuf'Junio C Hamano2007-10-03
|\ \
| * | nfv?asprintf are broken without va_copy, workaround them.Pierre Habouzit2007-09-20
| * | Use xmemdupz() in many places.Pierre Habouzit2007-09-18
* | | Make merge-recursive honor diff.renamelimitLars Hjemli2007-09-25
|/ /
* | Move make_cache_entry() from merge-recursive.c into read-cache.cCarlos Rica2007-09-12
|/
* Use xmkstemp() instead of mkstemp()Luiz Fernando N. Capitulino2007-08-14
* merge-recursive: do not rudely die on binary mergeJunio C Hamano2007-08-14
* Start moving unpack-trees to "struct tree_desc"Linus Torvalds2007-08-10
* -Wold-style-definition fixJunio C Hamano2007-06-13
* merge-recursive: refuse to merge binary filesJohannes Schindelin2007-06-04
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-26 18:30:25 +0000