Merge branch 'bc/acl-test'
[git] / Documentation / git-merge-tree.txt
2009-02-27  Junio C HamanoMerge branch 'cc/maint-1.6.0-bisect-fix'
2009-02-25  Junio C HamanoMerge branch 'jc/maint-1.6.0-pack-directory'
2009-02-12  Junio C HamanoMerge branch 'maint-1.6.0' into maint
2009-02-11  Junio C HamanoMerge branch 'maint-1.5.6' into maint
2009-02-11  Junio C HamanoMerge branch 'maint-1.5.5' into maint-1.5.6
2009-02-11  Junio C HamanoMerge branch 'js/maint-1.6.0-path-normalize'
2009-02-10  Junio C HamanoMerge branch 'maint-1.6.0' into maint
2009-02-06  Junio C HamanoMerge branch 'js/maint-remote-remove-mirror'
2009-02-06  Junio C HamanoMerge branch 'maint-1.6.0' into maint
2009-02-06  Junio C HamanoMerge branch 'sg/maint-gitdir-in-subdir' into maint
2009-02-06  Junio C HamanoMerge branch 'lt/maint-wrap-zlib' into maint
2009-02-06  Junio C HamanoMerge branch 'js/maint-all-implies-HEAD' into maint
2009-02-06  Junio C HamanoMerge branch 'kc/maint-diff-bwi-fix' into maint
2009-02-04  Junio C HamanoMerge branch 'maint-1.6.0' into maint
2009-02-04  Junio C HamanoMerge branch 'maint-1.6.0' into maint
2009-02-03  Junio C HamanoMerge branch 'maint-1.6.0' into maint
2009-02-01  Junio C HamanoMerge branch 'ks/maint-mailinfo-folded'
2009-02-01  Junio C HamanoMerge branch 'maint-1.6.0' into maint
2009-01-29  Junio C HamanoMerge branch 'jc/maint-format-patch-o-relative' into...
2009-01-29  Junio C HamanoMerge branch 'bs/maint-rename-populate-filespec' into...
2009-01-29  Junio C HamanoMerge branch 'maint-1.6.0' into maint
2009-01-27  Junio C HamanoMerge branch 'maint-1.6.0' into maint
2009-01-27  Junio C HamanoMerge branch 'jc/maint-1.6.0-split-diff-metainfo' into...
2009-01-26  Junio C HamanoMerge branch 'js/maint-all-implies-HEAD'
2009-01-24  Junio C HamanoMerge branch 'cb/maint-unpack-trees-absense' into maint
2009-01-24  Junio C HamanoMerge branch 'tr/maint-no-index-fixes' into maint
2009-01-24  Junio C HamanoMerge branch 'jc/maint-format-patch' into maint
2009-01-24  Junio C HamanoMerge branch 'maint-1.6.0' into maint
2009-01-22  Junio C HamanoMerge branch 'kc/maint-diff-bwi-fix'
2009-01-22  Junio C HamanoMerge branch 'lt/maint-wrap-zlib'
2009-01-22  Junio C HamanoMerge branch 'sg/maint-gitdir-in-subdir'
2009-01-22  Junio C HamanoMerge branch 'jc/maint-format-patch-o-relative'
2009-01-21  Junio C HamanoMerge branch 'bs/maint-rename-populate-filespec'
2009-01-20  Junio C HamanoMerge branch 'kc/maint-diff-bwi-fix'
2009-01-18  Junio C HamanoMerge branch 'ds/uintmax-config'
2009-01-18  Junio C HamanoMerge branch 'gb/gitweb-patch'
2009-01-18  Junio C HamanoMerge branch 'jc/maint-format-patch'
2009-01-18  Junio C HamanoMerge branch 'tr/maint-no-index-fixes'
2009-01-18  Junio C HamanoMerge branch 'maint-1.6.0' into maint
2009-01-15  Junio C HamanoMerge branch 'maint-1.6.0' into maint
2009-01-15  Junio C HamanoMerge branch 'maint-1.6.0' into maint
2009-01-14  Junio C HamanoMerge branch 'maint-1.6.0' into maint
2009-01-14  Junio C HamanoMerge branch 'js/bundle-tags'
2009-01-14  Junio C HamanoMerge branch 'cb/maint-unpack-trees-absense'
2009-01-13  Junio C HamanoMerge branch 'cb/maint-merge-recursive-fix' into maint
2009-01-13  Junio C HamanoMerge branch 'ap/maint-apply-modefix' into maint
2009-01-13  Junio C HamanoMerge branch 'maint-1.6.0' into maint
2009-01-12  Junio C HamanoMerge branch 'jc/maint-do-not-switch-to-non-commit...
2009-01-07  Junio C HamanoMerge branch 'jn/gitweb-blame'
2009-01-07  Junio C HamanoMerge branch 'wp/add-p-goto'
2009-01-07  Junio C HamanoMerge branch 'maint-1.6.0' into maint
2009-01-07  Junio C HamanoMerge branch 'maint-1.5.6' into maint-1.6.0
2009-01-03  Junio C HamanoMerge branch 'jc/maint-do-not-switch-to-non-commit'
2009-01-03  Junio C HamanoMerge branch 'ap/maint-apply-modefix'
2009-01-01  Junio C HamanoMerge branch 'cb/mergetool'
2008-12-29  Junio C HamanoMerge branch 'lt/reset-merge'
2008-12-27  Junio C HamanoMerge branch 'sp/maint-describe-all-tag-warning' into...
2008-12-22  Junio C HamanoMerge branch 'maint'
2008-12-22  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-12-20  Junio C HamanoMerge branch 'maint' to sync with GIT 1.6.0.6
2008-12-20  Junio C HamanoGIT 1.6.0.6 v1.6.0.6
2008-12-18  Junio C HamanoMerge git://repo.or.cz/git-gui
2008-12-17  Junio C HamanoGIT 1.5.6.6 v1.5.6.6
2008-12-16  Junio C HamanoMerge branch 'maint'
2008-12-15  Junio C HamanoMerge branch 'cb/maint-merge-recursive-fix' into cb...
2008-12-13  Junio C HamanoMerge branch 'maint'
2008-12-11  Junio C HamanoMerge branch 'maint'
2008-12-10  Junio C HamanoMerge branch 'maint'
2008-12-10  Ralf WildenhuesImprove language in git-merge.txt and related docs
2008-12-02  Junio C HamanoMerge git://repo.or.cz/git-gui
2008-12-02  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-12-01  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-12-01  Junio C HamanoMerge git://repo.or.cz/git-gui
2008-11-16  Junio C HamanoMerge git://repo.or.cz/git-gui
2008-11-13  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-11-13  Junio C HamanoMerge git://repo.or.cz/git-gui
2008-11-02  Junio C HamanoMerge git://repo.or.cz/git-gui
2008-11-02  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
2008-10-21  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-09-25  Shawn O. PearceMerge git://repo.or.cz/git-gui
2008-09-07  Junio C HamanoMerge updated git-gui and gitk that call each other
2008-09-06  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
2008-08-17  Junio C HamanoMerge git-gui 0.11.0
2008-08-17  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-08-14  Junio C HamanoMerge branch 'maint'
2008-08-13  Junio C HamanoMerge branch 'maint'
2008-08-12  Junio C HamanoMerge branch 'maint'
2008-08-11  Junio C HamanoMerge branch 'maint'
2008-08-11  Junio C HamanoMerge branch 'maint'
2008-08-09  Junio C HamanoMerge branch 'maint'
2008-08-06  Junio C HamanoSync with 1.5.6.5
2008-08-06  Junio C HamanoMerge git://repo.or.cz/git-gui
2008-08-06  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-08-06  Junio C HamanoMerge branch 'maint'
2008-08-03  Junio C HamanoMerge branch 'maint'
2008-08-02  Junio C HamanoMerge branch 'maint'
2008-08-02  Junio C HamanoMerge branch 'maint'
2008-07-30  Junio C HamanoMerge git://repo.or.cz/git-gui
2008-07-27  Junio C HamanoMerge git://repo.or.cz/git-gui
2008-07-25  Junio C HamanoMerge branch 'maint'
next