projects / git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Do git reset --hard HEAD when using git rebase --skip
[git] / git-merge-octopus.sh
2007-10-28  Junio C HamanoMerge branch 'master' of git://git./gitk/gitk blob | commitdiff | raw
2007-10-21  Shawn O. PearceMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw
2007-10-21  Shawn O. PearceMerge branch 'maint' of git://repo.or.cz/git-gui into... blob | commitdiff | raw
2007-09-18  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into... blob | commitdiff | raw
2007-08-29  Junio C HamanoMerge branch 'master' of git://git./gitk/gitk blob | commitdiff | raw
2007-08-27  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw
2007-08-26  J. Bruce FieldsMerge branch 'maint' blob | commitdiff | raw
2007-08-21  Junio C HamanoMerge branch 'master' of git://git./gitk/gitk blob | commitdiff | raw
2007-08-19  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw
2007-08-19  Junio C HamanoMerge branch 'master' of git://git./gitk/gitk blob | commitdiff | raw
2007-08-16  Junio C HamanoMerge branch 'maint' to sync with 1.5.2.5 blob | commitdiff | raw
2007-08-13  Junio C HamanoMerge branch 'master' of git://git./gitk/gitk blob | commitdiff | raw
2007-08-06  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw
2007-08-05  J. Bruce FieldsMerge branch 'maint' blob | commitdiff | raw
2007-08-01  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw
2007-07-30  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw
2007-07-28  Junio C HamanoMerge branch 'master' of git://git./gitk/gitk blob | commitdiff | raw
2007-07-19  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw
2007-07-14  Junio C HamanoMerge branch 'master' of git://git./gitk/gitk blob | commitdiff | raw
2007-07-12  Junio C HamanoMerge branch 'master' of git://git./gitk/gitk blob | commitdiff | raw
2007-07-12  Junio C HamanoMerge commit 'git-gui/master' blob | commitdiff | raw
2007-07-12  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw
2007-07-12  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into... blob | commitdiff | raw | diff to current
2007-07-10  Shawn O. PearceMerge branch 'maint' blob | commitdiff | raw
2007-07-09  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw
2007-07-07  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw
2007-07-04  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw
2007-07-03  Junio C HamanoRewrite "git-frotz" to "git frotz" blob | commitdiff | raw
2007-06-29  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2007-06-29  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into... blob | commitdiff | raw | diff to current
2007-06-28  Junio C HamanoMerge branch 'master' of git://git./gitk/gitk blob | commitdiff | raw | diff to current
2007-06-26  Junio C HamanoMerge branch 'master' of git://git./gitk/gitk into... blob | commitdiff | raw | diff to current
2007-06-22  Shawn O. PearceImport branch 'git-p4' of git://repo.or.cz/fast-export blob | commitdiff | raw | diff to current
2007-06-12  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
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 | diff to current
2007-06-11  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into... blob | commitdiff | raw | diff to current
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-03-22  Junio C HamanoMerge git://git2.kernel.org/pub/scm/gitk/gitk 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-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-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-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
2006-11-29  Junio C HamanoMerge master.kernel.org:/pub/scm/gitk/gitk 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-09-01  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk 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
2006-06-13  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2006-06-10  Junio C HamanoMerge git://git.kernel.org/pub/scm/git/gitweb blob | commitdiff | raw | diff to current
2006-06-07  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2006-06-04  Junio C HamanoMerge branch 'new' of git://git./gitk/gitk into next blob | commitdiff | raw | diff to current
2006-06-01  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2006-05-03  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2006-04-24  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2006-04-17  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2006-04-07  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2006-04-05  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2006-03-31  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2006-03-26  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2006-02-22  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2006-02-07  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2006-02-07  Junio C Hamanoread-tree --aggressive blob | commitdiff | raw | diff to current
2006-01-30  Junio C HamanoMerge fixes up to GIT 1.1.6 blob | commitdiff | raw | diff to current
2006-01-27  Junio C HamanoMerge fixes up to GIT 1.1.5 blob | commitdiff | raw | diff to current
2006-01-20  Junio C HamanoMerge fixes up to GIT 1.1.4 blob | commitdiff | raw | diff to current
2006-01-16  Junio C HamanoMerge fixes up to GIT 1.1.3 blob | commitdiff | raw | diff to current
2006-01-16  Junio C HamanoMerge branch 'fix' blob | commitdiff | raw | diff to current
2006-01-15  Junio C HamanoMerge branches 'jc/checkout', 'jc/format-patch', 'jc... blob | commitdiff | raw | diff to current
2006-01-15  Junio C Hamanooctopus: allow manual resolve on the last round. blob | commitdiff | raw | diff to current
2006-01-14  Junio C HamanoMerge fixes up to GIT 1.1.2 blob | commitdiff | raw | diff to current
2006-01-13  Junio C Hamanooctopus: allow criss-cross and clarify the message... blob | commitdiff | raw | diff to current
2005-12-07  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2005-12-04  Junio C HamanoGIT 0.99.9l aka 1.0rc4 v0.99.9l v1.0rc4 blob | commitdiff | raw | diff to current
2005-11-30  Junio C HamanoMerge branch 'jc/subdir' blob | commitdiff | raw | diff to current
2005-11-29  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2005-11-29  Junio C Hamanodefine die() for scripts that use it. blob | commitdiff | raw | diff to current
2005-11-28  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2005-11-27  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2005-11-22  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2005-11-20  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2005-11-19  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2005-11-12  Junio C HamanoGIT 0.99.9h v0.99.9h v1.0rc1 blob | commitdiff | raw | diff to current
2005-11-11  Junio C Hamanooctopus: do not do AND'ed merge base. blob | commitdiff | raw | diff to current
2005-10-27  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
next
Unnamed repository; edit this file 'description' to name the repository.