]> git.ipfire.org Git - thirdparty/git.git/history - merge-tree.c
Add basic infrastructure to assign attributes to paths
[thirdparty/git.git] / merge-tree.c
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-26  Junio C HamanoMerge branch 'jc/fpl'
2007-03-25  Junio C HamanoMerge branch 'maint'
2007-03-25  Junio C HamanoMerge branch 'js/remote-show-push'
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-21  Linus TorvaldsRemove "pathlen" from "struct name_entry"
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 '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-11  Junio C HamanoMerge branch 'maint'
2007-03-07  Junio C HamanoMerge branch 'maint'
2007-03-06  Junio C HamanoMerge branch 'maint'
2007-03-06  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui into...
2007-03-06  Junio C HamanoMerge branch 'maint'
2007-03-06  Junio C HamanoMerge branch 'master-for-junio' of git://repo.or.cz...
2007-03-05  Shawn O. PearceMerge branch 'maint'
2007-03-05  Junio C HamanoMerge branch 'js/fetch-progress' (early part)
2007-03-05  Junio C HamanoMerge branch 'maint'
2007-03-04  Junio C HamanoMerge branch 'maint'
2007-03-03  Junio C HamanoMerge branch 'maint'
2007-03-02  Junio C HamanoMerge branch 'js/commit-format'
2007-03-02  Junio C HamanoMerge branch 'maint'
2007-02-28  Junio C HamanoMerge branch 'js/commit-by-name'
2007-02-28  Junio C HamanoMerge branch 'js/bundle'
2007-02-28  Junio C HamanoMerge branch 'maint'
2007-02-28  Junio C HamanoMerge branch 'np/types'
2007-02-27  Junio C HamanoMerge branch 'np/types' into jc/fetch
2007-02-27  Nicolas Pitreconvert object type handling from a string to a number
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.kernel.org/pub/scm/gitk/gitk into maint
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
2006-11-29  Junio C HamanoMerge master.kernel.org:/pub/scm/gitk/gitk
2006-11-24  Junio C HamanoMerge branch 'jc/upload-pack'
2006-11-08  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-10-17  Junio C HamanoMerge branch 'maint'
2006-10-02  Junio C HamanoMerge branch 'maint'
2006-10-01  Junio C HamanoMerge branch 'maint'
2006-10-01  Junio C HamanoMerge branch 'jc/gitpm'
2006-09-18  Junio C HamanoMerge part of branch 'jc/upload-pack'
2006-09-18  Junio C HamanoMerge branch 'jc/pack'
2006-09-18  Junio C HamanoMerge branch 'jk/diff'
2006-09-17  Junio C HamanoMerge branch 'jc/archive'
2006-09-14  Dmitry V. LevinHandle invalid argc gently
2006-09-14  Dmitry V. LevinMake count-objects, describe and merge-tree work in...
2006-09-14  Junio C HamanoMerge branches 'maint' and 'jc/http'
2006-09-07  Junio C HamanoMerge branch 'jc/daemon'
2006-09-03  Junio C HamanoMerge branch 'master' into cc/trace
2006-09-02  Shawn PearceReplace uses of strdup with xstrdup.
2006-09-01  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-08-28  Junio C HamanoMerge branch 'js/c-merge-recursive'
2006-08-28  Junio C HamanoMerge branch 'jc/apply'
2006-08-26  Junio C HamanoMerge branch 'master' into gl/web
2006-08-23  Junio C HamanoMerge branch 'gl/cleanup' into gl/cleanup-next
2006-08-21  Junio C HamanoMerge branch 'maint'
2006-08-17  David RientjesDo not use memcmp(sha1_1, sha1_2, 20) with hardcoded...
2006-08-13  Junio C HamanoMerge branch 'jc/upload-pack'
2006-08-13  Junio C HamanoMerge branch 'th/diff-extra'
2006-08-13  Junio C HamanoGIT 1.4.2 v1.4.2
2006-08-13  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-08-08  Junio C HamanoMerge branch 'master' into pb/gitpm
2006-07-30  Junio C HamanoMerge branch 'jn/make'
2006-07-26  Junio C HamanoMerge branch 'pb/configure'
2006-07-17  Junio C HamanoMerge branch 'sp/reflog' v1.4.2-rc1
2006-07-13  Junio C HamanoMerge branch 'ml/trace'
2006-07-13  Junio C HamanoMerge branch 'js/merge-base'
2006-07-13  Junio C HamanoMerge branch 'lt/prune'
2006-07-13  Junio C HamanoMerge branch 'lt/merge-tree'
2006-06-29  Linus TorvaldsImproved three-way blob merging code
2006-06-29  Linus TorvaldsPrepare "git-merge-tree" for future work
2006-06-18  Junio C HamanoMerge branch 'jc/rw-prefix'
2006-06-13  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-06-10  Junio C HamanoMerge git://git.kernel.org/pub/scm/git/gitweb
2006-06-07  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-06-04  Junio C HamanoMerge branch 'new' of git://git.kernel.org/pub/scm...
2006-06-01  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-05-29  Junio C HamanoMerge branch 'jc/dirwalk-n-cache-tree' into jc/cache...
2006-05-28  Junio C HamanoMerge branch 'jc/cache-tree' into next
2006-05-21  Junio C HamanoMerge branch 'master' into js/fmt-patch
2006-05-20  Junio C HamanoMerge branch 'jc/cache-tree' into jc/dirwalk-n-cache...
2006-05-20  Junio C HamanoMerge branch 'js/fetchconfig'
2006-05-19  Junio C HamanoMerge part of 'js/fmt-patch' for RFC2822 dates into...
2006-05-18  Junio C HamanoMerge branch 'maint'
next