merge-recursive: refuse to merge binary files
[git/git.git] / t / t6024-recursive-merge.sh
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 'maint'
2007-04-29 Shawn O. PearceMerge branch 'gfi-maint' into gfi-master
2007-04-27 Junio C HamanoMerge branch 'maint'
2007-04-26 Junio C HamanoMerge branch 'maint'
2007-04-25 Junio C HamanoMerge branch 'maint'
2007-04-24 Junio C HamanoMerge branch 'maint'
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 'jc/quickfetch'
2007-04-22 Junio C HamanoMerge branch 'maint'
2007-04-20 Junio C HamanoMerge branch 'maint'
2007-04-19 Junio C HamanoMerge branch 'maint'
2007-04-18 Junio C HamanoMerge branch 'maint'
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-16 Junio C HamanoMerge branch 'js/wrap-log'
2007-04-16 Alex RiesenFix permissions on test scripts
2007-04-15 Junio C HamanoMerge git://git2./pub/scm/gitk/gitk into maint
2007-04-09 Junio C HamanoMerge branch 'js/fetch-progress'
2007-04-04 Junio C HamanoMerge 1.5.0.7 in
2007-03-30 Junio C HamanoMerge branch 'maint'
2007-03-28 Junio C HamanoMerge branch 'maint' to synchronize with 1.5.0.6
2007-03-25 Junio C HamanoMerge branch 'maint'
2007-03-25 Junio C HamanoMerge branch 'maint'
2007-03-24 Junio C HamanoMerge branch 'maint'
2007-03-22 Junio C HamanoMerge git://git2.kernel.org/pub/scm/gitk/gitk
2007-03-22 Junio C HamanoMerge branch 'maint'
2007-03-20 Junio C HamanoMerge git://git2.kernel.org/pub/scm/gitk/gitk
2007-03-18 Junio C HamanoMerge 1.5.0.5 in from 'maint'
2007-03-17 Junio C HamanoMerge branch 'maint'
2007-03-14 Junio C HamanoMerge GIT 1.5.0.4
2007-03-14 Junio C HamanoMerge branch 'jc/fetch'
2007-03-14 Junio C HamanoMerge branch 'jb/per-user-exclude'
2007-03-14 Junio C HamanoMerge branch 'maint'
2007-03-13 Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2007-03-13 Junio C HamanoMerge branch 'maint'
2007-03-12 Shawn O. PearceMerge branch 'maint'
2007-03-12 Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
2007-03-12 Junio C HamanoMerge branch 'maint'
2007-03-12 Junio C HamanoMerge branch 'jc/boundary'
2007-03-11 Junio C HamanoMerge branch 'js/attach'
2007-03-11 Junio C HamanoMerge branch 'js/diff-ni'
2007-03-06 Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui into...
2007-03-04 Johannes SchindelinGet rid of the dependency to GNU diff in the tests
2007-02-25 Junio C HamanoMerge git://repo.or.cz/git-gui into maint
2007-02-21 Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui into...
2007-02-18 Junio C HamanoMerge git://git./pub/scm/gitk/gitk into maint
2007-02-14 Junio C HamanoMerge branch 'jc/diff-apply-patch'
2007-02-13 Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2007-02-13 Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2007-02-12 Junio C HamanoMerge git-gui
2007-01-15 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2007-01-14 Shawn O. PearceMerge branch 'master' into sp/fast-import
2007-01-09 Junio C HamanoMerge branch 'maint'
2007-01-05 Junio C HamanoMerge branch 'maint'
2006-12-29 Junio C HamanoMerge branch 'jc/curl'
2006-12-29 Junio C HamanoMerge branch 'jc/utf8'
2006-12-29 Junio C HamanoMerge branch 'jc/make'
2006-12-28 Eric Wongt6024-recursive-merge: quiet down this test
2006-12-27 Junio C HamanoMerge branch 'master' into js/shallow
2006-12-27 Junio C HamanoMerge branch 'jc/fsck-reflog'
2006-12-25 Junio C HamanoMerge branch 'jc/skip-count'
next