Add a test showing that 'git repack' throws away grafted-away parents
[git] / builtin-merge-ours.c
2009-06-11  Junio C HamanoMerge branch 'uk/maint-1.5.3-rebase-i-reflog' into...
2009-05-02  Junio C HamanoMerge git://repo.or.cz/git-gui
2009-05-01  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2009-03-02  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-12-22  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-12-18  Junio C HamanoMerge git://repo.or.cz/git-gui
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-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-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-15  Junio C HamanoMerge git://repo.or.cz/git-gui
2008-07-06  Junio C HamanoMerge git://repo.or.cz/git-gui
2008-06-11  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-05-27  Junio C HamanoMerge git://repo.or.cz/git-gui
2008-05-24  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-05-15  Junio C HamanoMerge git://repo.or.cz/git-gui
2008-05-15  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-04-08  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-04-05  Junio C HamanoMerge git://repo.or.cz/git-gui
2008-04-02  Junio C HamanoMerge git://repo.or.cz/git-gui
2008-03-16  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2008-03-15  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-03-12  Junio C HamanoMerge git://repo.or.cz/git-gui
2008-03-06  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
2008-03-01  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2008-03-01  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
2008-02-23  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
2008-02-23  Junio C HamanoMerge branch 'bc/reflog-fix' into js/reflog-delete
2008-02-17  Junio C HamanoMerge git://repo.or.cz/git-gui
2008-02-17  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-02-13  Junio C HamanoMerge git://repo.or.cz/git-gui
2008-02-13  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-01-24  Junio C HamanoMerge git://repo.or.cz/git-gui
2008-01-21  Junio C HamanoMerge git://repo.or.cz/git-gui
2008-01-21  Junio C HamanoMerge git://repo.or.cz/git-gui
2008-01-21  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-01-11  Junio C HamanoMerge ../gitk
2008-01-09  Junio C HamanoMerge branch 'master' of git://git./gitk/gitk
2008-01-08  Junio C HamanoMerge in GIT 1.5.3.8
2008-01-05  Junio C HamanoMerge git://repo.or.cz/git-gui
2007-12-31  Junio C HamanoMerge branch 'maint' of git://linux-nfs.org/~bfields/git
2007-12-18  Junio C HamanoMerge branch 'maint'
2007-12-09  Junio C HamanoMerge branch 'jc/spht'
2007-12-09  Junio C HamanoMerge branch 'maint'
2007-12-07  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2007-12-07  Junio C HamanoMerge branch 'maint'
2007-12-06  Junio C HamanoMerge branch 'maint'
2007-12-05  Junio C HamanoMerge branch 'sp/refspec-match'
2007-12-02  Junio C HamanoMerge branch 'maint'
2007-12-02  Junio C HamanoMerge branch 'tt/help'
2007-12-01  Junio C HamanoMerge branch 'jc/move-gitk'
2007-12-01  Junio C HamanoMerge branch 'cr/tag-options'
2007-12-01  Junio C HamanoMerge 1.5.3.7 in
2007-12-01  Junio C HamanoMerge branch 'maint'
2007-11-29  Junio C HamanoMerge branch 'maint'
2007-11-26  Junio C HamanoMerge branch 'maint'
2007-11-25  Junio C HamanoMerge branch 'kh/commit' into wc/add-i
2007-11-25  Junio C HamanoMerge branch 'maint'
2007-11-25  Junio C HamanoMerge branch 'jk/send-pack'
2007-11-25  Junio C HamanoMerge branch 'sb/clean'
2007-11-25  Junio C HamanoMerge branch 'js/mingw-fallouts'
2007-11-25  Junio C HamanoMerge branch 'mh/rebase-skip-hard'
2007-11-25  Junio C HamanoMerge branch 'cc/bisect'
2007-11-23  Junio C HamanoMerge branch 'maint'
2007-11-23  Junio C HamanoMerge branch 'maint'
2007-11-22  Thomas Harninggit-merge-ours: make it a builtin.