merge-recursive: refuse to merge binary files
[git/git.git] / merge-recursive.c
2007-06-05 Johannes Schindelinmerge-recursive: refuse to merge binary files
2007-05-31 Junio C HamanoMerge branch 'maint-1.5.1' into maint
2007-05-29 Junio C HamanoMerge branch 'maint-1.5.1' into maint
2007-05-29 Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
2007-05-26 Junio C HamanoMerge branch 'maint-1.5.1' into maint
2007-05-25 Junio C HamanoMerge branch 'maint-1.5.1' into maint
2007-05-24 Junio C HamanoMerge branch 'maint-1.5.1' into maint
2007-05-23 Junio C HamanoMerge branch 'maint-1.5.1' into maint
2007-05-22 Junio C HamanoMerge branch 'maint-1.5.1' into maint
2007-05-21 Junio C HamanoMerge branch 'maint-1.5.1' into maint
2007-05-20 Junio C HamanoMerge branch 'maint' to synchronize with 1.5.1.6
2007-05-19 Junio C HamanoMerge branch 'maint'
2007-05-19 Junio C HamanoMerge 1.5.1.5 in
2007-05-18 Junio C HamanoMerge branch 'maint'
2007-05-17 Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2007-05-16 Junio C HamanoMerge branch 'maint'
2007-05-15 Junio C HamanoMerge branch 'maint'
2007-05-13 Junio C HamanoMerge branch 'maint'
2007-05-12 Junio C HamanoMerge branch 'maint'
2007-05-10 Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2007-05-10 Junio C HamanoMerge branch 'maint'
2007-05-10 Junio C HamanoMerge branch 'maint'
2007-05-09 Junio C HamanoMerge branch 'maint'
2007-05-08 Shawn O. PearceMerge branch 'master' of git://repo.or.cz/git-gui
2007-05-07 Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2007-05-07 Junio C HamanoMerge branch 'maint'
2007-05-07 Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
2007-05-07 Junio C HamanoMerge git://git2./pub/scm/gitk/gitk into maint
2007-05-06 Junio C HamanoMerge branch 'maint'
2007-05-04 Junio C HamanoMerge branch 'maint'
2007-05-02 Junio C HamanoMerge branch 'maint'
2007-05-02 Shawn O. PearceMerge branch 'gfi-maint' into gfi-master
2007-05-01 Junio C HamanoMerge branch 'maint'
2007-04-29 Junio C HamanoMerge branch 'jc/attr'
2007-04-29 Junio C HamanoMerge branch 'maint'
2007-04-29 Shawn O. PearceMerge branch 'gfi-maint' into gfi-master
2007-04-27 Junio C HamanoMerge branch 'maint'
2007-04-26 Alex RiesenIgnore merged status of the file-level merge
2007-04-26 Alex RiesenAdd a test for merging changed and rename-changed branches
2007-04-26 Alex RiesenAvoid excessive rewrites in merge-recursive
2007-04-26 Junio C HamanoMerge branch 'maint'
2007-04-25 Junio C HamanoMerge branch 'maint'
2007-04-25 Junio C HamanoMerge branch 'master' of git://repo.or.cz/git/fastimport
2007-04-24 Junio C HamanoMerge branch 'maint'
2007-04-22 Junio C HamanoMerge branch 'lt/objalloc'
2007-04-22 Junio C HamanoMerge branch 'jc/add'
2007-04-22 Junio C HamanoMerge branch 'jc/attr'
2007-04-22 Junio C HamanoMerge branch 'lt/gitlink'
2007-04-22 Junio C HamanoMerge branch 'np/pack'
2007-04-22 Junio C HamanoMerge branch 'jp/refs'
2007-04-22 Junio C HamanoMerge branch 'jc/quickfetch'
2007-04-22 Junio C HamanoMerge branch 'maint'
2007-04-21 Junio C HamanoFix bogus linked-list management for user defined merge...
2007-04-20 Shawn O. PearceKill the useless progress meter in merge-recursive
2007-04-20 Junio C HamanoMerge branch 'maint'
2007-04-20 Linus TorvaldsFix working directory errno handling when unlinking...
2007-04-19 Junio C HamanoMerge branch 'maint'
2007-04-19 Junio C HamanoSimplify code to find recursive merge driver.
2007-04-19 Junio C HamanoCounto-fix in merge-recursive
2007-04-18 Junio C HamanoMerge branch 'maint'
2007-04-18 Junio C HamanoFix funny types used in attribute value representation
2007-04-18 Junio C HamanoAllow low-level driver to specify different behaviour...
2007-04-18 Junio C HamanoCustom low-level merge driver: change the configuration...
2007-04-18 Junio C HamanoAllow the default low-level merge driver to be configured.
2007-04-18 Junio C HamanoCustom low-level merge driver support.
2007-04-18 Junio C HamanoMerge branch 'fl/cvsserver'
2007-04-18 Junio C HamanoMerge branch 'maint'
2007-04-18 Junio C HamanoMerge branch 'maint'
2007-04-18 Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2007-04-18 Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
2007-04-17 Junio C HamanoMerge branch 'jc/read-tree-df'
2007-04-17 Junio C HamanoAllow specifying specialized merge-backend per path.
2007-04-17 Junio C Hamanomerge-recursive: separate out xdl_merge() interface.
2007-04-16 Junio C HamanoMerge branch 'maint'
2007-04-16 Junio C HamanoMerge branch 'maint'
2007-04-15 Junio C HamanoMerge git://git2./pub/scm/gitk/gitk into maint
2007-04-14 Junio C HamanoMerge branch 'maint'
2007-04-13 Junio C HamanoMerge branch 'maint'
2007-04-12 Junio C HamanoMerge branch 'maint'
2007-04-10 Junio C HamanoMerge branch 'maint'
2007-04-10 Junio C Hamanomerge-recursive: handle D/F conflict case more carefully.
2007-04-10 Junio C Hamanomerge-recursive: do not barf on "to be removed" entries.
2007-04-09 Junio C HamanoMerge branch 'jc/push'
2007-04-09 Junio C HamanoMerge branch 'jc/merge-subtree'
2007-04-09 Junio C HamanoMerge branch 'js/fetch-progress'
2007-04-09 Junio C HamanoMerge branch 'maint'
2007-04-08 Junio C HamanoMerge branch 'jc/read-tree-df' (early part)
2007-04-08 Junio C HamanoMerge branch 'maint'
2007-04-07 Junio C HamanoA new merge stragety 'subtree'.
2007-04-07 Junio C HamanoMerge branch 'jc/index-output'
2007-04-07 Junio C HamanoMerge branch 'jc/checkout' (early part)
2007-04-07 Junio C HamanoMerge branch 'maint'
2007-04-05 Junio C HamanoMerge branch 'maint'
2007-04-05 Junio C HamanoFix bogus error message from merge-recursive error...
2007-04-04 Junio C HamanoMerge branch 'jc/bisect'
2007-04-04 Junio C HamanoMerge branch 'fl/doc'
2007-04-04 Junio C Hamano_GIT_INDEX_OUTPUT: allow plumbing to output to an alter...
2007-04-04 Junio C HamanoMerge 1.5.0.7 in
2007-03-31 Alex RiesenKeep rename/rename conflicts of intermediate merges...
2007-03-30 Junio C HamanoMerge branch 'maint'
next