Teach rebase -i about --preserve-merges
[git] / merge-index.c
2007-06-23  Junio C HamanoMerge branch 'js/filter'
2007-06-22  Shawn O. PearceImport branch 'git-p4' of git://repo.or.cz/fast-export
2007-06-16  Junio C HamanoMerge branch 'maint' to sync with GIT 1.5.2.2
2007-06-13  Junio C HamanoMerge branch 'maint'
2007-06-13  Junio C HamanoMerge branch 'aw/cvs'
2007-06-13  Junio C HamanoMerge branch 'ep/cvstag'
2007-06-12  Junio C HamanoMerge branch 'lh/submodule'
2007-06-12  Junio C HamanoMerge branch 'maint'
2007-06-12  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2007-06-12  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
2007-06-11  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2007-06-11  Junio C HamanoMerge branch 'maint'
2007-06-11  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
2007-06-10  Junio C HamanoMerge branch 'maint'
2007-06-09  Junio C HamanoMerge branch 'maint'
2007-06-09  Junio C HamanoMerge branch 'aj/pack'
2007-06-09  Junio C HamanoMerge branch 'js/merge'
2007-06-09  Junio C HamanoMerge branch 'ar/clone'
2007-06-08  Junio C HamanoMerge branch 'maint'
2007-06-07  Junio C HamanoWar on whitespace
2007-05-29  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
2007-05-17  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2007-05-10  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
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' of git://repo.or.cz/git-gui into...
2007-05-07  Junio C HamanoMerge git://git2./pub/scm/gitk/gitk into 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-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-26  Junio C HamanoMerge branch 'jc/fpl'
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-19  Junio C HamanoFix merge-index
2007-03-19  Junio C HamanoMerge branch 'jb/gc'
2007-03-19  Junio C HamanoMerge branch 'fl/cvsserver'
2007-03-19  Junio C HamanoMerge branch 'sp/run-command'
2007-03-13  Shawn O. PearceUse run_command within merge-index
2007-03-13  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2007-03-12  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
2007-03-06  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui into...
2007-03-05  Junio C HamanoMerge branch 'js/fetch-progress' (early part)
2007-03-02  Junio C HamanoMerge branch 'js/commit-format'
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 'mc/sendmail'
2007-02-27  Junio C HamanoMerge branch 'np/types' into jc/fetch
2007-02-26  Junio C HamanoMerge branch 'master' into js/diff-ni
2007-02-26  Junio C HamanoMerge branch 'maint'
2007-02-26  Junio C HamanoMerge branch 'jc/merge-symlink' into maint
2007-02-26  Junio C Hamanomerge-index: fix longstanding bug in merging symlinks
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-27  Junio C HamanoMerge branch 'master' into js/shallow
2006-12-25  Junio C HamanoMerge branch 'jc/git-add--interactive'
2006-12-22  Junio C HamanoMerge branch 'maint'
2006-12-21  Junio C HamanoMerge branch 'ew/svn-pm'
2006-12-20  Junio C HamanoMerge branch 'jc/leftright'
2006-12-20  Junio C HamanoMerge branch 'jc/blame'
2006-12-20  Junio C HamanoMerge branch 'jc/branch-remove-remote'
2006-12-20  Junio C HamanoMerge branch 'jc/clone'
2006-12-20  Junio C HamanoMerge branch 'maint'
2006-12-20  Junio C Hamanosimplify inclusion of system header files.
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-14  Junio C HamanoMerge branches 'maint' and 'jc/http'
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-23  Junio C HamanoMerge branch 'gl/cleanup' into gl/cleanup-next
2006-08-21  Junio C HamanoMerge branch 'maint'
2006-08-17  Junio C HamanoMerge branch 'jc/format-patch'
2006-08-16  Junio C HamanoMerge branch 'jc/racy'
2006-08-16  Junio C HamanoMerge branch 'maint'
2006-08-16  David Rientjesremove unnecessary initializations
2006-08-16  Junio C HamanoMerge branch 'maint'
2006-08-15  David Rientjesuse appropriate typedefs
2006-08-13  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
next