Andrew's git / gitweb.git / history
?
DESTDIR support for git/contrib/emacs
[gitweb.git] / git-merge-octopus.sh
2007-03-22 Merge git://git2.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2007-03-20 Merge git://git2.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2007-03-13 Merge branch 'master' of git://repo.or.cz/git-gui blob | diff | raw
2007-03-12 Merge branch 'maint' of git://repo.or.cz/git-gui into... blob | diff | raw
2007-03-06 Merge branch 'master' of git://repo.or.cz/git-gui into... blob | diff | raw
2007-02-25 Merge git://repo.or.cz/git-gui into maint blob | diff | raw
2007-02-21 Merge branch 'master' of git://repo.or.cz/git-gui into... blob | diff | raw
2007-02-18 Merge git://git./pub/scm/gitk/gitk into maint blob | diff | raw
2007-02-13 Merge branch 'master' of git://repo.or.cz/git-gui blob | diff | raw
2007-02-13 Merge branch 'master' of git://repo.or.cz/git-gui blob | diff | raw
2007-02-12 Merge git-gui blob | diff | raw
2007-01-15 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2006-11-29 Merge master.kernel.org:/pub/scm/gitk/gitk blob | diff | raw
2006-11-08 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2006-09-01 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2006-08-13 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2006-06-13 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2006-06-10 Merge git://git.kernel.org/pub/scm/git/gitweb blob | diff | raw
2006-06-07 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2006-06-04 Merge branch 'new' of git://git./gitk/gitk into next blob | diff | raw
2006-06-01 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2006-05-03 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2006-04-24 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2006-04-17 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2006-04-07 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2006-04-05 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2006-03-31 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2006-03-26 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2006-02-22 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2006-02-07 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2006-02-07 read-tree --aggressive blob | diff | raw
2006-01-30 Merge fixes up to GIT 1.1.6 blob | diff | raw | diff to current
2006-01-27 Merge fixes up to GIT 1.1.5 blob | diff | raw | diff to current
2006-01-20 Merge fixes up to GIT 1.1.4 blob | diff | raw | diff to current
2006-01-16 Merge fixes up to GIT 1.1.3 blob | diff | raw | diff to current
2006-01-16 Merge branch 'fix' blob | diff | raw | diff to current
2006-01-15 Merge branches 'jc/checkout', 'jc/format-patch', 'jc... blob | diff | raw | diff to current
2006-01-15 octopus: allow manual resolve on the last round. blob | diff | raw | diff to current
2006-01-14 Merge fixes up to GIT 1.1.2 blob | diff | raw | diff to current
2006-01-13 octopus: allow criss-cross and clarify the message... blob | diff | raw | diff to current
2005-12-07 Merge http://www.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2005-12-04 GIT 0.99.9l aka 1.0rc4 v0.99.9lv1.0rc4 blob | diff | raw | diff to current
2005-11-30 Merge branch 'jc/subdir' blob | diff | raw | diff to current
2005-11-29 Merge http://www.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2005-11-29 define die() for scripts that use it. blob | diff | raw | diff to current
2005-11-28 Merge http://www.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2005-11-27 Merge http://www.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2005-11-22 Merge http://www.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2005-11-20 Merge http://www.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2005-11-19 Merge http://www.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2005-11-12 GIT 0.99.9h v0.99.9hv1.0rc1 blob | diff | raw | diff to current
2005-11-11 octopus: do not do AND'ed merge base. blob | diff | raw | diff to current
2005-10-27 Merge http://www.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2005-09-27 Merge http://www.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2005-09-11 Multi-backend merge driver. blob | diff | raw | diff to current