projects / git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Teach rebase -i about --preserve-merges
[git] / merge-index.c
2007-06-23  Junio C HamanoMerge branch 'js/filter' blob | commitdiff | raw
2007-06-22  Shawn O. PearceImport branch 'git-p4' of git://repo.or.cz/fast-export blob | commitdiff | raw
2007-06-16  Junio C HamanoMerge branch 'maint' to sync with GIT 1.5.2.2 blob | commitdiff | raw
2007-06-13  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw
2007-06-13  Junio C HamanoMerge branch 'aw/cvs' blob | commitdiff | raw
2007-06-13  Junio C HamanoMerge branch 'ep/cvstag' blob | commitdiff | raw
2007-06-12  Junio C HamanoMerge branch 'lh/submodule' blob | commitdiff | raw
2007-06-12  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw
2007-06-12  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw
2007-06-12  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into... blob | commitdiff | raw | diff to current
2007-06-11  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw
2007-06-11  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw
2007-06-11  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into... blob | commitdiff | raw | diff to current
2007-06-10  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw
2007-06-09  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw
2007-06-09  Junio C HamanoMerge branch 'aj/pack' blob | commitdiff | raw
2007-06-09  Junio C HamanoMerge branch 'js/merge' blob | commitdiff | raw
2007-06-09  Junio C HamanoMerge branch 'ar/clone' blob | commitdiff | raw
2007-06-08  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw
2007-06-07  Junio C HamanoWar on whitespace blob | commitdiff | raw
2007-05-29  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into... blob | commitdiff | raw | diff to current
2007-05-17  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2007-05-10  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2007-05-08  Shawn O. PearceMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2007-05-07  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2007-05-07  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into... blob | commitdiff | raw | diff to current
2007-05-07  Junio C HamanoMerge git://git2./pub/scm/gitk/gitk into maint blob | commitdiff | raw | diff to current
2007-04-18  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2007-04-18  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into... blob | commitdiff | raw | diff to current
2007-04-15  Junio C HamanoMerge git://git2./pub/scm/gitk/gitk into maint blob | commitdiff | raw | diff to current
2007-04-09  Junio C HamanoMerge branch 'js/fetch-progress' blob | commitdiff | raw | diff to current
2007-04-04  Junio C HamanoMerge 1.5.0.7 in blob | commitdiff | raw | diff to current
2007-03-30  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-03-28  Junio C HamanoMerge branch 'maint' to synchronize with 1.5.0.6 blob | commitdiff | raw | diff to current
2007-03-26  Junio C HamanoMerge branch 'jc/fpl' blob | commitdiff | raw | diff to current
2007-03-25  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-03-25  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-03-24  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-03-22  Junio C HamanoMerge git://git2.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2007-03-22  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-03-20  Junio C HamanoMerge git://git2.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2007-03-19  Junio C HamanoFix merge-index blob | commitdiff | raw | diff to current
2007-03-19  Junio C HamanoMerge branch 'jb/gc' blob | commitdiff | raw | diff to current
2007-03-19  Junio C HamanoMerge branch 'fl/cvsserver' blob | commitdiff | raw | diff to current
2007-03-19  Junio C HamanoMerge branch 'sp/run-command' blob | commitdiff | raw | diff to current
2007-03-13  Shawn O. PearceUse run_command within merge-index blob | commitdiff | raw | diff to current
2007-03-13  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2007-03-12  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into... blob | commitdiff | raw | diff to current
2007-03-06  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui into... blob | commitdiff | raw | diff to current
2007-03-05  Junio C HamanoMerge branch 'js/fetch-progress' (early part) blob | commitdiff | raw | diff to current
2007-03-02  Junio C HamanoMerge branch 'js/commit-format' blob | commitdiff | raw | diff to current
2007-02-28  Junio C HamanoMerge branch 'js/commit-by-name' blob | commitdiff | raw | diff to current
2007-02-28  Junio C HamanoMerge branch 'js/bundle' blob | commitdiff | raw | diff to current
2007-02-28  Junio C HamanoMerge branch 'mc/sendmail' blob | commitdiff | raw | diff to current
2007-02-27  Junio C HamanoMerge branch 'np/types' into jc/fetch blob | commitdiff | raw | diff to current
2007-02-26  Junio C HamanoMerge branch 'master' into js/diff-ni blob | commitdiff | raw | diff to current
2007-02-26  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-02-26  Junio C HamanoMerge branch 'jc/merge-symlink' into maint blob | commitdiff | raw | diff to current
2007-02-26  Junio C Hamanomerge-index: fix longstanding bug in merging symlinks blob | commitdiff | raw | diff to current
2007-02-25  Junio C HamanoMerge git://repo.or.cz/git-gui into maint blob | commitdiff | raw | diff to current
2007-02-21  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui into... blob | commitdiff | raw | diff to current
2007-02-18  Junio C HamanoMerge git://git./pub/scm/gitk/gitk into maint blob | commitdiff | raw | diff to current
2007-02-14  Junio C HamanoMerge branch 'jc/diff-apply-patch' blob | commitdiff | raw | diff to current
2007-02-13  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2007-02-13  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2007-02-12  Junio C HamanoMerge git-gui blob | commitdiff | raw | diff to current
2007-01-15  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2007-01-14  Shawn O. PearceMerge branch 'master' into sp/fast-import blob | commitdiff | raw | diff to current
2007-01-09  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-01-05  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2006-12-27  Junio C HamanoMerge branch 'master' into js/shallow blob | commitdiff | raw | diff to current
2006-12-25  Junio C HamanoMerge branch 'jc/git-add--interactive' blob | commitdiff | raw | diff to current
2006-12-22  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2006-12-21  Junio C HamanoMerge branch 'ew/svn-pm' blob | commitdiff | raw | diff to current
2006-12-20  Junio C HamanoMerge branch 'jc/leftright' blob | commitdiff | raw | diff to current
2006-12-20  Junio C HamanoMerge branch 'jc/blame' blob | commitdiff | raw | diff to current
2006-12-20  Junio C HamanoMerge branch 'jc/branch-remove-remote' blob | commitdiff | raw | diff to current
2006-12-20  Junio C HamanoMerge branch 'jc/clone' blob | commitdiff | raw | diff to current
2006-12-20  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2006-12-20  Junio C Hamanosimplify inclusion of system header files. blob | commitdiff | raw | diff to current
2006-11-29  Junio C HamanoMerge master.kernel.org:/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2006-11-24  Junio C HamanoMerge branch 'jc/upload-pack' blob | commitdiff | raw | diff to current
2006-11-08  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2006-10-17  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2006-10-02  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2006-10-01  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2006-10-01  Junio C HamanoMerge branch 'jc/gitpm' blob | commitdiff | raw | diff to current
2006-09-18  Junio C HamanoMerge part of branch 'jc/upload-pack' blob | commitdiff | raw | diff to current
2006-09-14  Junio C HamanoMerge branches 'maint' and 'jc/http' blob | commitdiff | raw | diff to current
2006-09-01  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2006-08-28  Junio C HamanoMerge branch 'js/c-merge-recursive' blob | commitdiff | raw | diff to current
2006-08-23  Junio C HamanoMerge branch 'gl/cleanup' into gl/cleanup-next blob | commitdiff | raw | diff to current
2006-08-21  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2006-08-17  Junio C HamanoMerge branch 'jc/format-patch' blob | commitdiff | raw | diff to current
2006-08-16  Junio C HamanoMerge branch 'jc/racy' blob | commitdiff | raw | diff to current
2006-08-16  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2006-08-16  David Rientjesremove unnecessary initializations blob | commitdiff | raw | diff to current
2006-08-16  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2006-08-15  David Rientjesuse appropriate typedefs blob | commitdiff | raw | diff to current
2006-08-13  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
next
Unnamed repository; edit this file 'description' to name the repository.